Skip to content
Snippets Groups Projects
Commit cc3fb1ff authored by leggett's avatar leggett Committed by Frank Winklmeier
Browse files

nlohmann dependency

parent 34a27a47
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!37533updates for gaudi v34r1
......@@ -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
......
......@@ -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
......
......@@ -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 )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment