From 8cf79f6b6536da47c6b6e10c80d82c770f92e4d8 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Tue, 24 Nov 2020 10:47:04 +0100
Subject: [PATCH] D3PDMaker: cmake cleanup
cmake cleanup of the remaining (possibly obsolete) D3PDMaker packages.
---
.../D3PDMaker/JetD3PDMaker/CMakeLists.txt | 36 ++---------------
.../MissingETD3PDMaker/CMakeLists.txt | 30 ++------------
.../D3PDMaker/TrackD3PDMaker/CMakeLists.txt | 40 +------------------
.../TruthD3PDAnalysis/CMakeLists.txt | 39 +++---------------
4 files changed, 14 insertions(+), 131 deletions(-)
diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt
index acedec85539..f5f6fd7a125 100644
--- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt
@@ -1,47 +1,17 @@
-################################################################################
-# Package: JetD3PDMaker
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( JetD3PDMaker )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Trigger/TrigEvent/TrigCaloEvent
- PRIVATE
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/Navigation
- Control/StoreGate
- DetectorDescription/Identifier
- Event/EventKernel
- Event/FourMomUtils
- GaudiKernel
- PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
- PhysicsAnalysis/D3PDMaker/D3PDMakerInterfaces
- PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
- PhysicsAnalysis/D3PDMaker/TriggerD3PDMaker
- PhysicsAnalysis/JetTagging/JetTagEvent
- PhysicsAnalysis/JetTagging/JetTagInfo
- Reconstruction/Jet/JetEvent
- Reconstruction/Particle
- TileCalorimeter/TileConditions
- TileCalorimeter/TileEvent
- TileCalorimeter/TileIdentifier
- Tracking/TrkEvent/VxVertex )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost )
# Component(s) in the package:
atlas_add_component( JetD3PDMaker
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} TrigCaloEvent CaloEvent CaloGeoHelpers CaloIdentifier AthenaBaseComps AthenaKernel Navigation StoreGateLib SGtests Identifier EventKernel FourMomUtils GaudiKernel AnalysisTriggerEvent D3PDMakerUtils TriggerD3PDMakerLib JetTagEvent JetTagInfo JetEvent Particle TileConditionsLib TileEvent TileIdentifier VxVertex )
+ LINK_LIBRARIES ${Boost_LIBRARIES} TrigCaloEvent CaloEvent CaloGeoHelpers CaloIdentifier AthenaBaseComps AthenaKernel Navigation StoreGateLib Identifier EventKernel FourMomUtils GaudiKernel AnalysisTriggerEvent D3PDMakerInterfaces D3PDMakerUtils TriggerD3PDMakerLib JetTagEvent JetTagInfo JetEvent Particle TileConditionsLib TileEvent TileIdentifier VxVertex )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/CMakeLists.txt
index 0f4804cad9d..5f934fcd6f0 100644
--- a/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/MissingETD3PDMaker/CMakeLists.txt
@@ -1,44 +1,20 @@
-################################################################################
-# Package: MissingETD3PDMaker
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( MissingETD3PDMaker )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloEvent
- Control/StoreGate
- Event/EventKernel
- GaudiKernel
- PhysicsAnalysis/D3PDMaker/D3PDMakerInterfaces
- PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
- Reconstruction/Jet/JetEvent
- Reconstruction/MissingETEvent
- Reconstruction/MissingETGoodness
- Reconstruction/MissingETPerformance
- Reconstruction/Particle
- PRIVATE
- Control/AthenaKernel
- Event/FourMomUtils
- Event/xAOD/xAODMissingET
- Reconstruction/MuonIdentification/muonEvent
- Reconstruction/egamma/egammaEvent
- Reconstruction/tauEvent )
-
# External dependencies:
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core )
# Component(s) in the package:
atlas_add_component( MissingETD3PDMaker
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent StoreGateLib SGtests EventKernel GaudiKernel D3PDMakerUtils JetEvent MissingETEvent MissingETGoodnessLib MissingETPerformanceLib Particle AthenaKernel FourMomUtils xAODMissingET muonEvent egammaEvent tauEvent )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent StoreGateLib EventKernel GaudiKernel D3PDMakerInterfaces D3PDMakerUtils JetEvent MissingETEvent MissingETGoodnessLib MissingETPerformanceLib Particle AthenaKernel FourMomUtils xAODMissingET muonEvent egammaEvent tauEvent )
# Install files from the package:
-atlas_install_headers( MissingETD3PDMaker )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/CMakeLists.txt
index 12bfb4093a7..f50e867947f 100644
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/CMakeLists.txt
@@ -1,48 +1,12 @@
-################################################################################
-# Package: TrackD3PDMaker
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrackD3PDMaker )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Tracking/TrkEvent/TrkParameters
- PRIVATE
- Control/AthenaKernel
- Control/CxxUtils
- DetectorDescription/Identifier
- Event/EventPrimitives
- Event/xAOD/xAODBase
- Event/xAOD/xAODPrimitives
- Event/xAOD/xAODTracking
- GaudiKernel
- InnerDetector/InDetConditions/InDetBeamSpotService
- InnerDetector/InDetConditions/InDetConditionsSummaryService
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetRecTools/InDetTestBLayer
- PhysicsAnalysis/AnalysisCommon/ParticleEvent
- PhysicsAnalysis/D3PDMaker/D3PDMakerInterfaces
- PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
- Reconstruction/Particle
- Reconstruction/RecoTools/ITrackToVertex
- Reconstruction/RecoTools/RecoToolInterfaces
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkParticleBase
- Tracking/TrkEvent/VxVertex
- Generators/AtlasHepMC )
-
-# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( HepPDT )
-
# Component(s) in the package:
atlas_add_component( TrackD3PDMaker
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} AtlasHepMCLib TrkParameters AthenaKernel CxxUtils SGtests Identifier EventPrimitives xAODBase xAODPrimitives xAODTracking GaudiKernel InDetIdentifier InDetReadoutGeometry InDetTestBLayerLib ParticleEvent D3PDMakerUtils Particle ITrackToVertex RecoToolInterfaces TrkEventPrimitives TrkParticleBase VxVertex InDetBeamSpotServiceLib )
+ LINK_LIBRARIES TrkParameters AthenaKernel CxxUtils Identifier EventPrimitives xAODBase xAODPrimitives xAODTracking GaudiKernel InDetIdentifier InDetReadoutGeometry InDetTestBLayerLib ParticleEvent D3PDMakerInterfaces D3PDMakerUtils Particle InDetRecToolInterfaces ITrackToVertex RecoToolInterfaces TrkEventPrimitives TrkParticleBase VxVertex InDetBeamSpotServiceLib )
# Install files from the package:
-atlas_install_headers( TrackD3PDMaker )
atlas_install_python_modules( python/*.py )
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/CMakeLists.txt
index e15e3a568bd..0fa2b0a9ce6 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis/CMakeLists.txt
@@ -1,50 +1,23 @@
-################################################################################
-# Package: TruthD3PDAnalysis
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TruthD3PDAnalysis )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
- PhysicsAnalysis/TruthParticleID/McParticleKernel
- PRIVATE
- Control/AthenaKernel
- Control/StoreGate
- Event/EventKernel
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODJet
- Event/xAOD/xAODMuon
- Generators/GenAnalysisTools/TruthHelper
- Generators/GeneratorObjects
- Generators/AtlasHepMC
- PhysicsAnalysis/AnalysisCommon/ParticleJetTools
- PhysicsAnalysis/MCTruthClassifier
- PhysicsAnalysis/TruthParticleID/McParticleEvent
- Reconstruction/Particle
- Reconstruction/ParticleTruth
- Tracking/TrkEvent/TrkParticleBase
- Tracking/TrkEvent/VxVertex )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost )
find_package( HepPDT )
# Component(s) in the package:
atlas_add_library( TruthD3PDAnalysisLib
src/*.cxx
PUBLIC_HEADERS TruthD3PDAnalysis
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaBaseComps GaudiKernel D3PDMakerUtils McParticleKernel StoreGateLib SGtests ParticleJetToolsLib MCTruthClassifierLib MCTruthClassifierLib
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} AtlasHepMCLib AthenaKernel EventKernel xAODEgamma xAODJet xAODMuon TruthHelper GeneratorObjects McParticleEvent Particle ParticleTruth TrkParticleBase VxVertex )
+ PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS}
+ LINK_LIBRARIES AthenaBaseComps AtlasHepMCLib D3PDMakerUtils GaudiKernel McParticleKernel MCTruthClassifierLib
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} AthenaKernel EventKernel xAODEgamma xAODJet xAODMuon TruthHelper GeneratorObjects McParticleEvent Particle ParticleJetToolsLib ParticleTruth StoreGateLib TrkParticleBase VxVertex )
atlas_add_component( TruthD3PDAnalysis
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel D3PDMakerUtils McParticleKernel AthenaKernel StoreGateLib SGtests EventKernel xAODEgamma xAODJet xAODMuon TruthHelper GeneratorObjects ParticleJetToolsLib MCTruthClassifierLib McParticleEvent Particle ParticleTruth TrkParticleBase VxVertex TruthD3PDAnalysisLib MCTruthClassifierLib )
+ LINK_LIBRARIES TruthD3PDAnalysisLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
--
GitLab