Skip to content

Commit 9cb4937

Browse files
authored
Merge pull request #484 from wdconinc/link-libraries-root-core-only
fix: link to ROOT::Core only
2 parents dc642ed + 37af9e6 commit 9cb4937

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ if (${USE_ROOT})
8787
find_package(ROOT REQUIRED)
8888
set(JANA2_HAVE_ROOT 1)
8989
include_directories(${ROOT_INCLUDE_DIRS})
90-
link_libraries(${ROOT_LIBRARIES})
90+
link_libraries(ROOT::Core)
9191
execute_process(
9292
COMMAND ${ROOT_BINDIR}/root-config --features
9393
OUTPUT_VARIABLE ROOT_FEATURES

src/examples/misc/RootDatamodelExample/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if(${USE_ROOT})
3838
PUBLIC_HEADER ${RootDatamodelExample_HEADERS})
3939

4040
target_include_directories(RootDatamodelExample PUBLIC ${ROOT_INCLUDE_DIRS})
41-
target_link_libraries(RootDatamodelExample PUBLIC ${ROOT_LIBRARIES})
41+
target_link_libraries(RootDatamodelExample PUBLIC ROOT::Core)
4242

4343
message(STATUS "Installing ROOT PCM files: ${my_pcms}")
4444
install(FILES ${my_pcms} DESTINATION lib/JANA/plugins)

src/libraries/JANA/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ target_link_libraries(jana2 PRIVATE VendoredTomlPlusPlus)
7575
target_link_libraries(jana2 PRIVATE VendoredMD5) # To pull in the header file
7676

7777
if (${USE_PODIO})
78-
target_link_libraries(jana2 PUBLIC podio::podio podio::podioRootIO ${ROOT_LIBRARIES})
78+
target_link_libraries(jana2 PUBLIC podio::podio podio::podioRootIO)
7979
elseif (${USE_ROOT})
80-
target_link_libraries(jana2 PUBLIC ${ROOT_LIBRARIES})
80+
target_link_libraries(jana2 PUBLIC ROOT::Core)
8181
endif()
8282

8383

@@ -90,9 +90,9 @@ target_link_libraries(jana2_static_lib PUBLIC ${CMAKE_DL_LIBS} Threads::Threads)
9090
target_link_libraries(jana2_static_lib PUBLIC VendoredTomlPlusPlus)
9191

9292
if (${USE_PODIO})
93-
target_link_libraries(jana2_static_lib PUBLIC podio::podio podio::podioRootIO ${ROOT_LIBRARIES})
93+
target_link_libraries(jana2_static_lib PUBLIC podio::podio podio::podioRootIO)
9494
elseif (${USE_ROOT})
95-
target_link_libraries(jana2_static_lib PUBLIC ${ROOT_LIBRARIES})
95+
target_link_libraries(jana2_static_lib PUBLIC ROOT::Core)
9696
endif()
9797
install(TARGETS jana2_static_lib EXPORT jana2_targets DESTINATION lib)
9898

@@ -106,9 +106,9 @@ target_link_libraries(jana2_shared_lib PUBLIC ${CMAKE_DL_LIBS} Threads::Threads)
106106
target_link_libraries(jana2_shared_lib PUBLIC VendoredTomlPlusPlus)
107107

108108
if (${USE_PODIO})
109-
target_link_libraries(jana2_shared_lib PUBLIC podio::podio podio::podioRootIO ${ROOT_LIBRARIES})
109+
target_link_libraries(jana2_shared_lib PUBLIC podio::podio podio::podioRootIO)
110110
elseif (${USE_ROOT})
111-
target_link_libraries(jana2_shared_lib PUBLIC ${ROOT_LIBRARIES})
111+
target_link_libraries(jana2_shared_lib PUBLIC ROOT::Core)
112112
endif()
113113

114114
install(TARGETS jana2_shared_lib EXPORT jana2_targets DESTINATION lib)

0 commit comments

Comments
 (0)