From 32769c4f1dc27b4804a8c65c4c2c98677669c785 Mon Sep 17 00:00:00 2001 From: scott snyder <sss@karma> Date: Mon, 11 Oct 2021 15:38:24 -0400 Subject: [PATCH] LArSamplesMon: cmake fixes Remove unneeded/undefined uses of CLHEP macros. LCE_CellList should link against LArSamplesMon library, not the dictionary. --- LArCalorimeter/LArSamplesMon/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LArCalorimeter/LArSamplesMon/CMakeLists.txt b/LArCalorimeter/LArSamplesMon/CMakeLists.txt index e3707eefaf46..09ba88036bc3 100644 --- a/LArCalorimeter/LArSamplesMon/CMakeLists.txt +++ b/LArCalorimeter/LArSamplesMon/CMakeLists.txt @@ -16,9 +16,9 @@ find_package( CORAL COMPONENTS CoralBase ) atlas_add_library( LArSamplesMon src/*.cxx src/components/*.cxx - INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} + INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} PUBLIC_HEADERS LArSamplesMon - LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CaloDetDescrLib CaloGeoHelpers CaloIdentifier AthenaMonitoringLib StoreGateLib SGtests Identifier GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArCablingLib LWHists TrigDecisionToolLib CaloConditions AthenaKernel AthenaPoolUtilities xAODEventInfo LArCOOLConditions LArRawConditions LArRecEvent LArCafJobsLib ) + LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} CaloDetDescrLib CaloGeoHelpers CaloIdentifier AthenaMonitoringLib StoreGateLib SGtests Identifier GaudiKernel LArIdentifier LArRawEvent LArRecConditions LArCablingLib LWHists TrigDecisionToolLib CaloConditions AthenaKernel AthenaPoolUtilities xAODEventInfo LArCOOLConditions LArRawConditions LArRecEvent LArCafJobsLib ) # Component(s) in the package: atlas_add_dictionary( LArSamplesMonDict @@ -30,7 +30,7 @@ atlas_add_dictionary( LArSamplesMonDict atlas_add_executable( LCE_CellList src/LCE_CellList.cxx INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel LArSamplesMonDict LArCafJobsLib ) #LArSamplesMonLib LArCafJobsDict + LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel LArSamplesMon LArCafJobsLib ) #LArSamplesMonLib LArCafJobsDict # Install files from the package: atlas_install_headers( LArSamplesMon ) -- GitLab