Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/examples/misc/RootDatamodelExample/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions src/libraries/JANA/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ 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_LIBRARIES})
target_link_libraries(jana2 PUBLIC ROOT::Core)
endif()


Expand All @@ -90,9 +90,9 @@ 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_LIBRARIES})
target_link_libraries(jana2_static_lib PUBLIC ROOT::Core)
endif()
install(TARGETS jana2_static_lib EXPORT jana2_targets DESTINATION lib)

Expand All @@ -106,9 +106,9 @@ 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_LIBRARIES})
target_link_libraries(jana2_shared_lib PUBLIC ROOT::Core)
endif()

install(TARGETS jana2_shared_lib EXPORT jana2_targets DESTINATION lib)
Expand Down
Loading