Skip to content
Snippets Groups Projects
Commit 1b6ab863 authored by scott snyder's avatar scott snyder Committed by scott snyder
Browse files

LArMonitoring: cmake fixes

Don't build an object into more than one library.
parent 6325287f
No related branches found
No related tags found
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,!38406LArMonitoring: cmake fixes
...@@ -9,7 +9,7 @@ find_package( CLHEP ) ...@@ -9,7 +9,7 @@ find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 ) find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
atlas_add_library( LArStrHelper atlas_add_library( LArStrHelper
src/LArStrHelper.cxx LArMonitoring/LArStrHelper.h src/StrHelper/LArStrHelper.cxx LArMonitoring/LArStrHelper.h
PUBLIC_HEADERS LArMonitoring PUBLIC_HEADERS LArMonitoring
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES}) LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES})
...@@ -20,7 +20,7 @@ atlas_add_component( LArMonitoring ...@@ -20,7 +20,7 @@ atlas_add_component( LArMonitoring
src/*.cxx src/*.cxx
src/components/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CaloDetDescrLib CaloGeoHelpers CaloIdentifier AthenaMonitoringLib SGtests Identifier LArIdentifier LArRawEvent LArRecConditions LArCablingLib TrigDecisionToolLib CaloConditions AthenaKernel AthenaPoolUtilities xAODEventInfo LArCOOLConditions LArRawConditions LArRecEvent ) LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CaloDetDescrLib CaloGeoHelpers CaloIdentifier AthenaMonitoringLib SGtests Identifier LArIdentifier LArRawEvent LArRecConditions LArCablingLib TrigDecisionToolLib CaloConditions AthenaKernel AthenaPoolUtilities xAODEventInfo LArCOOLConditions LArRawConditions LArRecEvent LArStrHelper )
atlas_add_dictionary( LArStrHelperDict atlas_add_dictionary( LArStrHelperDict
LArMonitoring/LArStrHelperDict.h LArMonitoring/LArStrHelperDict.h
......
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