Skip to content
Snippets Groups Projects
Commit ff4607f5 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'cmake.D3PDMakerUtils-20200818' into 'master' 

D3PDMakerUtils+ElectronPhotonTagTools+LArCafJobs: cmake fixes

See merge request !35722
parents 88c4c918 74e8c708
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
LArCalorimeter/LArCafJobs/CMakeLists.txt
+ 2
− 40
View file @ ff4607f5
...@@ -5,48 +5,10 @@ ...@@ -5,48 +5,10 @@
# Declare the package name: # Declare the package name:
atlas_subdir( LArCafJobs ) atlas_subdir( LArCafJobs )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Calorimeter/CaloIdentifier
Control/AthenaBaseComps
Control/AthenaKernel
Control/StoreGate
Calorimeter/CaloDetDescr
Calorimeter/CaloInterface
DetectorDescription/Identifier
GaudiKernel
LArCalorimeter/LArIdentifier
LArCalorimeter/LArRawConditions
LArCalorimeter/LArRawEvent
LArCalorimeter/LArRecConditions
LArCalorimeter/LArCabling
LArCalorimeter/LArCabling
LArCalorimeter/LArBadChannelTool
PhysicsAnalysis/AnalysisCommon/AnalysisTools
PhysicsAnalysis/TruthParticleID/McParticleEvent
Reconstruction/egamma/egammaEvent
Tools/PyJobTransformsCore
Trigger/TrigAnalysis/TrigAnalysisInterfaces
Trigger/TrigAnalysis/TrigDecisionTool
Trigger/TrigConfiguration/TrigConfInterfaces
Trigger/TrigEvent/TrigSteeringEvent
PRIVATE
Calorimeter/CaloEvent
Database/AthenaPOOL/AthenaPoolUtilities
DataQuality/DataQualityUtils
Event/xAOD/xAODEventInfo
Event/NavFourMom
LArCalorimeter/LArElecCalib
LArCalorimeter/LArRecEvent
Trigger/TrigConfiguration/TrigConfHLTData
Trigger/TrigT1/TrigT1Result
Generators/AtlasHepMC )
# External dependencies: # External dependencies:
find_package( Boost COMPONENTS filesystem thread system ) find_package( Boost COMPONENTS filesystem thread system )
find_package( ROOT COMPONENTS Matrix Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 ) find_package( ROOT COMPONENTS Matrix Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
# tag ROOTBasicLibs was not recognized in automatic conversion in cmt2cmake
# Component(s) in the package: # Component(s) in the package:
atlas_add_library( LArCafJobsLib atlas_add_library( LArCafJobsLib
...@@ -72,8 +34,8 @@ atlas_add_library( LArCafJobsLib ...@@ -72,8 +34,8 @@ atlas_add_library( LArCafJobsLib
src/LArReadCells.cxx src/LArReadCells.cxx
PUBLIC_HEADERS LArCafJobs PUBLIC_HEADERS LArCafJobs
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES CaloIdentifier AthenaBaseComps AthenaKernel GaudiKernel LArIdentifier LArRawConditions LArRawEvent egammaEvent TrigSteeringEvent McParticleEvent StoreGateLib SGtests LArToolsLib TrigDecisionToolLib CaloDetDescrLib LINK_LIBRARIES CaloIdentifier AthenaBaseComps AthenaKernel GaudiKernel LArIdentifier LArRawConditions LArRawEvent egammaEvent TrigSteeringEvent McParticleEvent StoreGateLib SGtests LArToolsLib TrigDecisionToolLib CaloDetDescrLib AthAnalysisToolsLib TrigAnalysisInterfaces CaloInterfaceLib
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result AtlasHepMCLib ) PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result AtlasHepMCLib LArRecEvent )
atlas_add_component( LArCafJobs atlas_add_component( LArCafJobs
src/components/*.cxx src/components/*.cxx
......
PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/CMakeLists.txt
+ 2
− 14
View file @ ff4607f5
...@@ -5,18 +5,6 @@ ...@@ -5,18 +5,6 @@
# Declare the package name: # Declare the package name:
atlas_subdir( D3PDMakerUtils ) atlas_subdir( D3PDMakerUtils )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/AthenaKernel
Control/AthLinks
Control/SGTools
Control/StoreGate
GaudiKernel
PhysicsAnalysis/D3PDMaker/D3PDMakerInterfaces
PRIVATE
Control/AthContainersInterfaces )
# External dependencies: # External dependencies:
find_package( Boost COMPONENTS filesystem thread system ) find_package( Boost COMPONENTS filesystem thread system )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread ) find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
...@@ -27,6 +15,6 @@ atlas_add_library( D3PDMakerUtils ...@@ -27,6 +15,6 @@ atlas_add_library( D3PDMakerUtils
PUBLIC_HEADERS D3PDMakerUtils PUBLIC_HEADERS D3PDMakerUtils
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel AthLinks SGTools GaudiKernel StoreGateLib SGtests LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel AthLinks SGTools GaudiKernel StoreGateLib SGtests D3PDMakerInterfaces
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ) PRIVATE_LINK_LIBRARIES AthContainersInterfaces ${ROOT_LIBRARIES} )
PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/CMakeLists.txt
+ 1
− 25
View file @ ff4607f5
...@@ -5,35 +5,11 @@ ...@@ -5,35 +5,11 @@
# Declare the package name: # Declare the package name:
atlas_subdir( ElectronPhotonTagTools ) atlas_subdir( ElectronPhotonTagTools )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/StoreGate
Database/AthenaPOOL/AthenaPoolUtilities
Event/EventInfo
Event/xAOD/xAODEgamma
Event/xAOD/xAODEventInfo
Event/xAOD/xAODMissingET
GaudiKernel
PhysicsAnalysis/ElectronPhotonID/IsolationCorrections
PhysicsAnalysis/AnalysisCommon/IsolationSelection
PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces
PhysicsAnalysis/EventTag/TagEvent
PRIVATE
Event/xAOD/xAODCore
Event/xAOD/xAODParticleEvent
Event/xAOD/xAODTracking
PhysicsAnalysis/AnalysisCommon/AnalysisUtils )
# tag ROOTGraphicsLibs was not recognized in automatic conversion in cmt2cmake
# tag ROOTMathLibs was not recognized in automatic conversion in cmt2cmake
# Component(s) in the package: # Component(s) in the package:
atlas_add_library( ElectronPhotonTagToolsLib atlas_add_library( ElectronPhotonTagToolsLib
src/*.cxx src/*.cxx
PUBLIC_HEADERS ElectronPhotonTagTools PUBLIC_HEADERS ElectronPhotonTagTools
LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities EventInfo xAODEgamma xAODEventInfo xAODMissingET GaudiKernel TagEvent StoreGateLib SGtests IsolationSelectionLib EgammaAnalysisInterfacesLib AnalysisUtilsLib LINK_LIBRARIES AthenaBaseComps AthenaPoolUtilities EventInfo xAODEgamma xAODEventInfo xAODMissingET GaudiKernel TagEvent StoreGateLib SGtests IsolationSelectionLib EgammaAnalysisInterfacesLib AnalysisUtilsLib IsolationCorrectionsLib
PRIVATE_LINK_LIBRARIES xAODCore xAODParticleEvent xAODTracking ) PRIVATE_LINK_LIBRARIES xAODCore xAODParticleEvent xAODTracking )
atlas_add_component( ElectronPhotonTagTools atlas_add_component( ElectronPhotonTagTools
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment