Merge branch 'cmake.D3PDMakerRoot-20200820' into 'master'

D3PDMakerRoot+TruthD3PDMaker+TriggerD3PDMaker: cmake fixes

See merge request atlas/athena!35783

PhysicsAnalysis/D3PDMaker/D3PDMakerRoot/CMakeLists.txt

@@ -5,13 +5,6 @@
 # Declare the package name:
 atlas_subdir( D3PDMakerRoot )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          GaudiKernel
-                          PhysicsAnalysis/D3PDMaker/D3PDMakerInterfaces )
-
 # External dependencies:
 find_package( ROOT COMPONENTS RIO Tree Core MathCore Hist pthread )
 
@@ -20,5 +13,5 @@ atlas_add_component( D3PDMakerRoot
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel D3PDMakerInterfaces )
 

PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker/CMakeLists.txt

@@ -5,31 +5,6 @@
 # Declare the package name:
 atlas_subdir( TriggerD3PDMaker )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Control/CxxUtils
-                          Event/EventKernel
-                          Event/FourMomUtils
-                          GaudiKernel
-                          PhysicsAnalysis/D3PDMaker/D3PDMakerInterfaces
-                          PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
-                          Trigger/TrigAnalysis/TrigDecisionTool
-                          Trigger/TrigAnalysis/TrigObjectMatching
-                          Trigger/TrigEvent/TrigSteeringEvent
-                          PRIVATE
-                          Control/StoreGate
-                          Event/xAOD/xAODTrigger
-                          PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
-                          Trigger/TrigAnalysis/TrigAnalysisInterfaces
-                          Trigger/TrigConfiguration/TrigConfHLTData
-                          Trigger/TrigConfiguration/TrigConfInterfaces
-                          Trigger/TrigConfiguration/TrigConfL1Data
-                          Trigger/TrigEvent/TrigMonitoringEvent
-                          Trigger/TrigT1/TrigT1Interfaces
-                          Trigger/TrigT1/TrigT1Result )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 
@@ -39,12 +14,12 @@ atlas_add_library( TriggerD3PDMakerLib
                    PUBLIC_HEADERS TriggerD3PDMaker
                    INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
                    LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils EventKernel FourMomUtils GaudiKernel D3PDMakerUtils TrigSteeringEvent TrigDecisionToolLib TrigObjectMatchingLib StoreGateLib SGtests
-                   PRIVATE_LINK_LIBRARIES xAODTrigger AnalysisTriggerEvent TrigConfHLTData TrigConfL1Data TrigMonitoringEvent TrigT1Interfaces TrigT1Result )
+                   PRIVATE_LINK_LIBRARIES xAODTrigger AnalysisTriggerEvent TrigConfHLTData TrigConfL1Data TrigMonitoringEvent TrigT1Interfaces TrigT1Result TrigAnalysisInterfaces )
 
 atlas_add_component( TriggerD3PDMaker
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils EventKernel FourMomUtils GaudiKernel D3PDMakerUtils TrigDecisionToolLib TrigObjectMatchingLib TrigSteeringEvent StoreGateLib SGtests xAODTrigger AnalysisTriggerEvent TrigConfHLTData TrigConfL1Data TrigMonitoringEvent TrigT1Interfaces TrigT1Result TriggerD3PDMakerLib )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils EventKernel FourMomUtils GaudiKernel D3PDMakerUtils TrigDecisionToolLib TrigObjectMatchingLib TrigSteeringEvent StoreGateLib SGtests xAODTrigger AnalysisTriggerEvent TrigConfHLTData TrigConfL1Data TrigMonitoringEvent TrigT1Interfaces TrigT1Result TriggerD3PDMakerLib TrigAnalysisInterfaces )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )

PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/CMakeLists.txt

@@ -36,7 +36,7 @@ atlas_add_component( TruthD3PDMaker
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} 
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel Navigation EventInfo xAODTruth GaudiKernel GeneratorObjects TruthUtils D3PDMakerUtils TruthD3PDAnalysisLib MCTruthClassifierLib McParticleEvent McParticleKernel JetEvent TrkToolInterfaces )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel Navigation EventInfo xAODTruth GaudiKernel GeneratorObjects TruthUtils D3PDMakerUtils TruthD3PDAnalysisLib MCTruthClassifierLib McParticleEvent McParticleKernel JetEvent TrkToolInterfaces GenInterfacesLib )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )