From c704feece3d3a46c3156cef7699cb3b82c80b005 Mon Sep 17 00:00:00 2001 From: Nathan Brei Date: Mon, 27 Mar 2023 16:41:11 -0400 Subject: [PATCH] JANA2.1.0 compiles with USE_PODIO=On (#576) ### Briefly, what does this PR introduce? This is the smallest set of changes needed to make EICrecon compile when using JANA2 2.1.0 with USE_PODIO=On. This doesn't use the new features, which will come in a separate pull request. ### What kind of change does this PR introduce? - [ ] Bug fix (issue #__) - [ ] New feature (issue #__) - [ ] Documentation update - [x] Other: Enables dependency upgrade ### Please check if this PR fulfills the following: - [ ] Tests for the changes have been added - [ ] Documentation has been added / updated - [x] Changes have been communicated to collaborators ### Does this PR introduce breaking changes? What changes might users need to make to their code? No. ### Does this PR change default behavior? No. --------- Co-authored-by: Dmitry Romanov --- src/examples/log_example/CMakeLists.txt | 3 +++ src/services/geometry/acts/CMakeLists.txt | 2 +- src/utilities/eicrecon/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/examples/log_example/CMakeLists.txt b/src/examples/log_example/CMakeLists.txt index 7af067bf7d..3a9c4f0784 100644 --- a/src/examples/log_example/CMakeLists.txt +++ b/src/examples/log_example/CMakeLists.txt @@ -12,3 +12,6 @@ plugin_add(${PLUGIN_NAME}) # Then correctly sets sources for ${_name}_plugin and ${_name}_library targets # Adds headers to the correct installation directory plugin_glob_all(${PLUGIN_NAME}) + +# TODO his is a temporary fix for JANA 2.1.0. This plugin have nothing to do with event model +plugin_add_event_model(${PLUGIN_NAME}) diff --git a/src/services/geometry/acts/CMakeLists.txt b/src/services/geometry/acts/CMakeLists.txt index cf9a0d3e67..57c74d9f4d 100644 --- a/src/services/geometry/acts/CMakeLists.txt +++ b/src/services/geometry/acts/CMakeLists.txt @@ -29,7 +29,7 @@ plugin_glob_all(${PLUGIN_NAME}) # Add libraries # (same as target_include_directories but for both plugin and library) -plugin_link_libraries(${PLUGIN_NAME} algorithms_digi_library algorithms_tracking_library) +plugin_link_libraries(${PLUGIN_NAME} podio::podio podio::podioRootIO algorithms_digi_library algorithms_tracking_library) # ## Add include directories (works same as target_include_directories) diff --git a/src/utilities/eicrecon/CMakeLists.txt b/src/utilities/eicrecon/CMakeLists.txt index 0496aeb15f..7c78156496 100644 --- a/src/utilities/eicrecon/CMakeLists.txt +++ b/src/utilities/eicrecon/CMakeLists.txt @@ -14,7 +14,7 @@ find_package(ROOT REQUIRED COMPONENTS Core Tree Hist RIO EG) file(GLOB SOURCES *.cpp *.cc *.c *.hpp *.hh *.h) set( INCLUDE_DIRS ${PROJECT_BINARY_DIR} ${EICRECON_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR} ${JANA_INCLUDE_DIR} ${ROOT_INCLUDE_DIRS}) -set( LINK_LIBRARIES ${JANA_LIB} ${ROOT_LIBRARIES} ${CMAKE_DL_LIBS} Threads::Threads ) +set( LINK_LIBRARIES ${JANA_LIB} ${ROOT_LIBRARIES} ${CMAKE_DL_LIBS} Threads::Threads podio::podio podio::podioRootIO) # Define executable add_executable( eicrecon ${SOURCES} )