diff --git a/LArCalorimeter/LArCafJobs/CMakeLists.txt b/LArCalorimeter/LArCafJobs/CMakeLists.txt
index 48c593bbfa42b13097ebd275a34650fcc80f22b7..b57041ca90cfb97e971a487c8951598201d0444c 100644
--- a/LArCalorimeter/LArCafJobs/CMakeLists.txt
+++ b/LArCalorimeter/LArCafJobs/CMakeLists.txt
@@ -5,48 +5,10 @@
# Declare the package name:
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:
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 )
-# tag ROOTBasicLibs was not recognized in automatic conversion in cmt2cmake
# Component(s) in the package:
atlas_add_library( LArCafJobsLib
@@ -72,8 +34,8 @@ atlas_add_library( LArCafJobsLib
src/LArReadCells.cxx
PUBLIC_HEADERS LArCafJobs
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
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result AtlasHepMCLib )
+ 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 LArRecEvent )
atlas_add_component( LArCafJobs
src/components/*.cxx
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/CMakeLists.txt
index 7afd086a9b4abf9b47f27eb6237491a65e3d6731..9d93c660103a8777eb79d82db79aaf6e9c45e7be 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/CMakeLists.txt
@@ -5,18 +5,6 @@
# Declare the package name:
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:
find_package( Boost COMPONENTS filesystem thread system )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -27,6 +15,6 @@ atlas_add_library( D3PDMakerUtils
PUBLIC_HEADERS D3PDMakerUtils
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel AthLinks SGTools GaudiKernel StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+ LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel AthLinks SGTools GaudiKernel StoreGateLib SGtests D3PDMakerInterfaces
+ PRIVATE_LINK_LIBRARIES AthContainersInterfaces ${ROOT_LIBRARIES} )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/CMakeLists.txt
index 3965a83ed1a6a8d3087c5d70ca7dc7883669445c..56ce531f68935082eab579ff1fc33970f82ec853 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/CMakeLists.txt
@@ -5,35 +5,11 @@
# Declare the package name:
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:
atlas_add_library( ElectronPhotonTagToolsLib
src/*.cxx
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 )
atlas_add_component( ElectronPhotonTagTools