From 30c09fc1859680d7439bb399844b06d31c469ad8 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 19 Dec 2025 11:09:27 -0600 Subject: [PATCH 1/2] fix: link only against ROOT::Core --- CMakeLists.txt | 2 +- src/examples/misc/RootDatamodelExample/CMakeLists.txt | 2 +- src/libraries/JANA/CMakeLists.txt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 248f5a67b..cbb35e879 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,7 @@ if (${USE_ROOT}) find_package(ROOT REQUIRED) set(JANA2_HAVE_ROOT 1) include_directories(${ROOT_INCLUDE_DIRS}) - link_libraries(${ROOT_LIBRARIES}) + link_libraries(ROOT::Core) execute_process( COMMAND ${ROOT_BINDIR}/root-config --features OUTPUT_VARIABLE ROOT_FEATURES diff --git a/src/examples/misc/RootDatamodelExample/CMakeLists.txt b/src/examples/misc/RootDatamodelExample/CMakeLists.txt index 2ca2e4fc8..589ff9cf0 100644 --- a/src/examples/misc/RootDatamodelExample/CMakeLists.txt +++ b/src/examples/misc/RootDatamodelExample/CMakeLists.txt @@ -38,7 +38,7 @@ if(${USE_ROOT}) PUBLIC_HEADER ${RootDatamodelExample_HEADERS}) target_include_directories(RootDatamodelExample PUBLIC ${ROOT_INCLUDE_DIRS}) - target_link_libraries(RootDatamodelExample PUBLIC ${ROOT_LIBRARIES}) + target_link_libraries(RootDatamodelExample PUBLIC ROOT::Core) message(STATUS "Installing ROOT PCM files: ${my_pcms}") install(FILES ${my_pcms} DESTINATION lib/JANA/plugins) diff --git a/src/libraries/JANA/CMakeLists.txt b/src/libraries/JANA/CMakeLists.txt index 14457ea11..4b89fcf7f 100644 --- a/src/libraries/JANA/CMakeLists.txt +++ b/src/libraries/JANA/CMakeLists.txt @@ -77,7 +77,7 @@ target_link_libraries(jana2 PRIVATE VendoredMD5) # To pull in the header file if (${USE_PODIO}) target_link_libraries(jana2 PUBLIC podio::podio podio::podioRootIO ${ROOT_LIBRARIES}) elseif (${USE_ROOT}) - target_link_libraries(jana2 PUBLIC ${ROOT_LIBRARIES}) + target_link_libraries(jana2 PUBLIC ROOT::Core) endif() @@ -92,7 +92,7 @@ target_link_libraries(jana2_static_lib PUBLIC VendoredTomlPlusPlus) if (${USE_PODIO}) target_link_libraries(jana2_static_lib PUBLIC podio::podio podio::podioRootIO ${ROOT_LIBRARIES}) elseif (${USE_ROOT}) - target_link_libraries(jana2_static_lib PUBLIC ${ROOT_LIBRARIES}) + target_link_libraries(jana2_static_lib PUBLIC ROOT::Core) endif() install(TARGETS jana2_static_lib EXPORT jana2_targets DESTINATION lib) @@ -108,7 +108,7 @@ target_link_libraries(jana2_shared_lib PUBLIC VendoredTomlPlusPlus) if (${USE_PODIO}) target_link_libraries(jana2_shared_lib PUBLIC podio::podio podio::podioRootIO ${ROOT_LIBRARIES}) elseif (${USE_ROOT}) - target_link_libraries(jana2_shared_lib PUBLIC ${ROOT_LIBRARIES}) + target_link_libraries(jana2_shared_lib PUBLIC ROOT::Core) endif() install(TARGETS jana2_shared_lib EXPORT jana2_targets DESTINATION lib) From 37af9e6250fd29f4ec5faabab4ebb7ddd79043b7 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 19 Dec 2025 11:10:16 -0600 Subject: [PATCH 2/2] fix: don't explicitly link ROOT when transitive in podioRootIO --- src/libraries/JANA/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/JANA/CMakeLists.txt b/src/libraries/JANA/CMakeLists.txt index 4b89fcf7f..42da51242 100644 --- a/src/libraries/JANA/CMakeLists.txt +++ b/src/libraries/JANA/CMakeLists.txt @@ -75,7 +75,7 @@ target_link_libraries(jana2 PRIVATE VendoredTomlPlusPlus) target_link_libraries(jana2 PRIVATE VendoredMD5) # To pull in the header file if (${USE_PODIO}) - target_link_libraries(jana2 PUBLIC podio::podio podio::podioRootIO ${ROOT_LIBRARIES}) + target_link_libraries(jana2 PUBLIC podio::podio podio::podioRootIO) elseif (${USE_ROOT}) target_link_libraries(jana2 PUBLIC ROOT::Core) endif() @@ -90,7 +90,7 @@ target_link_libraries(jana2_static_lib PUBLIC ${CMAKE_DL_LIBS} Threads::Threads) target_link_libraries(jana2_static_lib PUBLIC VendoredTomlPlusPlus) if (${USE_PODIO}) - target_link_libraries(jana2_static_lib PUBLIC podio::podio podio::podioRootIO ${ROOT_LIBRARIES}) + target_link_libraries(jana2_static_lib PUBLIC podio::podio podio::podioRootIO) elseif (${USE_ROOT}) target_link_libraries(jana2_static_lib PUBLIC ROOT::Core) endif() @@ -106,7 +106,7 @@ target_link_libraries(jana2_shared_lib PUBLIC ${CMAKE_DL_LIBS} Threads::Threads) target_link_libraries(jana2_shared_lib PUBLIC VendoredTomlPlusPlus) if (${USE_PODIO}) - target_link_libraries(jana2_shared_lib PUBLIC podio::podio podio::podioRootIO ${ROOT_LIBRARIES}) + target_link_libraries(jana2_shared_lib PUBLIC podio::podio podio::podioRootIO) elseif (${USE_ROOT}) target_link_libraries(jana2_shared_lib PUBLIC ROOT::Core) endif()