diff --git a/Control/AthenaKernel/CMakeLists.txt b/Control/AthenaKernel/CMakeLists.txt index 7feb5914ff98bad2629084770aa41a72ff7e27be..dd63d3716979140a209046ce77c76f1e7bc8d6fd 100644 --- a/Control/AthenaKernel/CMakeLists.txt +++ b/Control/AthenaKernel/CMakeLists.txt @@ -8,6 +8,7 @@ find_package( Boost COMPONENTS program_options regex filesystem thread ) find_package( UUID ) find_package( CLHEP ) find_package( TBB ) +find_package( nlohmann_json ) # Only link agains the RT library if it's available. find_library( RT_LIBRARY rt ) if( NOT RT_LIBRARY ) @@ -20,7 +21,7 @@ atlas_add_library( AthenaKernel PUBLIC_HEADERS AthenaKernel INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} - LINK_LIBRARIES ${Boost_LIBRARIES} ${UUID_LIBRARIES} ${RT_LIBRARY} CxxUtils DataModelRoot GaudiKernel + LINK_LIBRARIES ${Boost_LIBRARIES} ${UUID_LIBRARIES} ${RT_LIBRARY} CxxUtils DataModelRoot GaudiKernel nlohmann_json::nlohmann_json PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${CMAKE_DL_LIBS} RootUtils ) atlas_add_dictionary( AthenaKernelDict diff --git a/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt index b8b87a5a403e069c7fad82484258ca9006814de9..def162b93526d9656b10bf9a6873435ccfc9d024 100644 --- a/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt +++ b/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt @@ -6,6 +6,7 @@ atlas_subdir( PerfMonEvent ) # External dependencies: find_package( Python COMPONENTS Development ) find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread ) +find_package( nlohmann_json ) # We don't have a direct dependency on boost from this package, but if we # pick up the dependency implicitly rather than explicitly, we include @@ -24,7 +25,7 @@ atlas_add_library( PerfMonEvent PUBLIC_HEADERS PerfMonEvent INCLUDE_DIRS ${Python_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} - LINK_LIBRARIES ${Python_LIBRARIES} ${Boost_LIBRARIES} GaudiKernel rt + LINK_LIBRARIES ${Python_LIBRARIES} ${Boost_LIBRARIES} GaudiKernel rt nlohmann_json::nlohmann_json PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ) atlas_add_dictionary( PerfMonEventDict diff --git a/Control/PerformanceMonitoring/PerfMonKernel/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonKernel/CMakeLists.txt index 9e25e2831531903de0e1107f1b7abd23fa18e69f..f1819b438d712d8c5b3ff207b234ae9c3f15dae1 100644 --- a/Control/PerformanceMonitoring/PerfMonKernel/CMakeLists.txt +++ b/Control/PerformanceMonitoring/PerfMonKernel/CMakeLists.txt @@ -5,11 +5,12 @@ atlas_subdir( PerfMonKernel ) # External dependencies: find_package( Boost ) +find_package( nlohmann_json ) # Component(s) in the package: atlas_add_library( PerfMonKernel src/*.cxx PUBLIC_HEADERS PerfMonKernel INCLUDE_DIRS ${Boost_INCLUDE_DIRS} - LINK_LIBRARIES ${Boost_LIBRARIES} GaudiKernel ) + LINK_LIBRARIES ${Boost_LIBRARIES} GaudiKernel nlohmann_json::nlohmann_json )