From cc3fb1ff647ce0a3968d535b7de4462d17e4d9fd Mon Sep 17 00:00:00 2001
From: leggett <leggett@cern.ch>
Date: Thu, 22 Oct 2020 09:16:41 -0700
Subject: [PATCH] nlohmann dependency
---
Control/AthenaKernel/CMakeLists.txt | 3 ++-
Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt | 3 ++-
Control/PerformanceMonitoring/PerfMonKernel/CMakeLists.txt | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Control/AthenaKernel/CMakeLists.txt b/Control/AthenaKernel/CMakeLists.txt
index 7feb5914ff9..dd63d371697 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 b8b87a5a403..def162b9352 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 9e25e283153..f1819b438d7 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 )
--
GitLab