From c15cc508e91cbd4cce01cb3284ed3c3ad9bae401 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Sat, 13 Jan 2024 17:12:35 +0100 Subject: [PATCH 1/3] Change LCIO_LIBRARIES to LCIO::lcio --- k4EDM4hep2LcioConv/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/k4EDM4hep2LcioConv/CMakeLists.txt b/k4EDM4hep2LcioConv/CMakeLists.txt index 773d21fa..f8635594 100644 --- a/k4EDM4hep2LcioConv/CMakeLists.txt +++ b/k4EDM4hep2LcioConv/CMakeLists.txt @@ -10,7 +10,7 @@ target_include_directories(k4EDM4hep2LcioConv PUBLIC $) target_link_libraries(k4EDM4hep2LcioConv PUBLIC - ${LCIO_LIBRARIES} + LCIO::lcio EDM4HEP::edm4hep) set(public_headers diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e5063f0f..8ae868cc 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,9 +1,9 @@ add_library(edmCompare SHARED src/CompareEDM4hepLCIO.cc src/ObjectMapping.cc src/CompareEDM4hepEDM4hep.cc) -target_link_libraries(edmCompare PUBLIC EDM4HEP::edm4hep ${LCIO_LIBRARIES}) +target_link_libraries(edmCompare PUBLIC EDM4HEP::edm4hep LCIO::lcio) target_include_directories(edmCompare PUBLIC ${LCIO_INCLUDE_DIRS}) add_library(TestUtils SHARED src/EDM4hep2LCIOUtilities.cc) -target_link_libraries(TestUtils PUBLIC EDM4HEP::edm4hep ${LCIO_LIBRARIES}) +target_link_libraries(TestUtils PUBLIC EDM4HEP::edm4hep LCIO::lcio) target_include_directories(TestUtils PUBLIC ${LCIO_INCLUDE_DIRS}) add_executable(compare-contents compare_contents.cpp) @@ -26,7 +26,7 @@ target_include_directories(edm4hep_roundtrip PRIVATE add_test(NAME edm4hep_roundtrip COMMAND edm4hep_roundtrip) include(ExternalData) -list(APPEND ExternalData_URL_TEMPLATES +set(ExternalData_URL_TEMPLATES "https://key4hep.web.cern.ch:443/testFiles/k4EDM4hep2LcioConv/%(hash)" ) From e612069f511057210218137987756caae54c6347 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Sat, 13 Jan 2024 17:18:47 +0100 Subject: [PATCH 2/3] Remove unnecessary LCIO_INCLUDE_DIRS --- k4EDM4hep2LcioConv/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/k4EDM4hep2LcioConv/CMakeLists.txt b/k4EDM4hep2LcioConv/CMakeLists.txt index f8635594..7495cf52 100644 --- a/k4EDM4hep2LcioConv/CMakeLists.txt +++ b/k4EDM4hep2LcioConv/CMakeLists.txt @@ -5,7 +5,6 @@ add_library(k4EDM4hep2LcioConv SHARED add_library(k4EDM4hep2LcioConv::k4EDM4hep2LcioConv ALIAS k4EDM4hep2LcioConv) target_include_directories(k4EDM4hep2LcioConv PUBLIC - ${LCIO_INCLUDE_DIRS} $ $) From 0fe1ebb4847f667423de16fc048178713500334c Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 15 Jan 2024 16:41:20 +0100 Subject: [PATCH 3/3] Add a version to LCIO --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a728338d..eac9a90d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ endif() # Ninja compiler output include(cmake/compiler_output.cmake) -find_package(LCIO REQUIRED) +find_package(LCIO 2.20.1 REQUIRED) find_package(podio REQUIRED) find_package(EDM4HEP 0.10.1 REQUIRED)