Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change ${LCIO_LIBRARIES} to LCIO::lcio #44

Merged
merged 3 commits into from
Jan 16, 2024
+5 −6
Merged

Change ${LCIO_LIBRARIES} to LCIO::lcio #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c15cc50
Change LCIO_LIBRARIES to LCIO::lcio
jmcarcell Jan 13, 2024
e612069
Remove unnecessary LCIO_INCLUDE_DIRS
jmcarcell Jan 13, 2024
0fe1ebb
Add a version to LCIO
jmcarcell Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions k4EDM4hep2LcioConv/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ add_library(k4EDM4hep2LcioConv SHARED
add_library(k4EDM4hep2LcioConv::k4EDM4hep2LcioConv ALIAS k4EDM4hep2LcioConv)

target_include_directories(k4EDM4hep2LcioConv PUBLIC
${LCIO_INCLUDE_DIRS}
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)

target_link_libraries(k4EDM4hep2LcioConv PUBLIC
${LCIO_LIBRARIES}
LCIO::lcio
EDM4HEP::edm4hep)

set(public_headers
Expand Down
6 changes: 3 additions & 3 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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)"
)

Expand Down
Loading