From 7206d9563923c86816167f171f8ee4553f3c20a0 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Tue, 17 Nov 2020 10:54:59 +0100
Subject: [PATCH] D3PDMaker: cmake cleanup
---
.../D3PDMakerCoreComps/CMakeLists.txt | 24 +++----------
.../D3PDMaker/D3PDMakerReader/CMakeLists.txt | 36 +++++--------------
.../D3PDMaker/D3PDMakerUtils/CMakeLists.txt | 13 +++----
.../EventCommonD3PDMaker/CMakeLists.txt | 30 +++-------------
.../D3PDMaker/TruthD3PDMaker/CMakeLists.txt | 29 ++-------------
5 files changed, 25 insertions(+), 107 deletions(-)
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/CMakeLists.txt
index 1c59a569074..6e503583d72 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/CMakeLists.txt
@@ -1,34 +1,18 @@
-################################################################################
-# Package: D3PDMakerCoreComps
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( D3PDMakerCoreComps )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthContainers
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/Navigation
- Control/RootUtils
- Control/SGTools
- Database/AthenaPOOL/AthenaPoolCnvSvc
- GaudiKernel
- PhysicsAnalysis/AnalysisCommon/ParticleEvent
- PhysicsAnalysis/D3PDMaker/D3PDMakerInterfaces
- PhysicsAnalysis/D3PDMaker/D3PDMakerUtils )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost )
+find_package( ROOT COMPONENTS Core RIO )
# Component(s) in the package:
atlas_add_component( D3PDMakerCoreComps
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaBaseComps AthenaKernel Navigation RootUtils RootUtilsPyROOT SGTools AthenaPoolCnvSvcLib GaudiKernel ParticleEvent D3PDMakerUtils )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaBaseComps AthenaKernel AthenaPoolCnvSvcLib D3PDMakerInterfaces D3PDMakerUtils GaudiKernel ParticleEvent RootUtils SGTools )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/CMakeLists.txt
index 23615453cec..8a66bae6515 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/CMakeLists.txt
@@ -1,55 +1,37 @@
-################################################################################
-# Package: D3PDMakerReader
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( D3PDMakerReader )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- GaudiKernel
- PhysicsAnalysis/D3PDMaker/D3PDMakerInterfaces
- PhysicsAnalysis/D3PDMaker/D3PDMakerUtils )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( D3PDMakerReaderLib
src/*.cxx
- PUBLIC_HEADERS D3PDMakerReader
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel D3PDMakerUtils )
+ NO_PUBLIC_HEADERS
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel D3PDMakerInterfaces D3PDMakerUtils )
atlas_add_component( D3PDMakerReader
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel D3PDMakerUtils D3PDMakerReaderLib )
+ LINK_LIBRARIES D3PDMakerReaderLib )
atlas_add_dictionary( D3PDMakerReaderDict
src/D3PDMakerReaderDict.h
D3PDMakerReader/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel D3PDMakerUtils D3PDMakerReaderLib )
+ LINK_LIBRARIES D3PDMakerReaderLib )
atlas_add_executable( d3pdReaderMaker
src/apps/d3pdReaderMaker.cxx
- src/CodeGenerator_v2.cxx
- src/RootObjectMetadata.cxx
- src/isPrimitive.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel D3PDMakerUtils D3PDMakerReaderLib )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel GaudiKernel D3PDMakerReaderLib )
atlas_add_executable( d3pdReadersFromFile
src/apps/d3pdReadersFromFile.cxx
- src/CodeGenerator_v2.cxx
- src/RootObjectMetadata.cxx
- src/isPrimitive.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel D3PDMakerUtils D3PDMakerReaderLib )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel D3PDMakerUtils GaudiKernel D3PDMakerReaderLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/CMakeLists.txt
index 9d93c660103..822bc2ac9b0 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerUtils/CMakeLists.txt
@@ -1,13 +1,11 @@
-################################################################################
-# Package: D3PDMakerUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( D3PDMakerUtils )
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost )
+find_package( ROOT COMPONENTS Core )
# Component(s) in the package:
atlas_add_library( D3PDMakerUtils
@@ -15,6 +13,5 @@ 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 D3PDMakerInterfaces
- PRIVATE_LINK_LIBRARIES AthContainersInterfaces ${ROOT_LIBRARIES} )
-
+ LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel AthLinks GaudiKernel StoreGateLib D3PDMakerInterfaces
+ PRIVATE_LINK_LIBRARIES AthContainersInterfaces ${ROOT_LIBRARIES} SGTools )
diff --git a/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/CMakeLists.txt
index 42bc81ee001..a4b8faa6b56 100644
--- a/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/EventCommonD3PDMaker/CMakeLists.txt
@@ -1,40 +1,18 @@
-################################################################################
-# Package: EventCommonD3PDMaker
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( EventCommonD3PDMaker )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/Navigation
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/IOVDbDataModel
- Event/EventBookkeeperMetaData
- Event/EventKernel
- Event/FourMomUtils
- Event/NavFourMom
- Event/xAOD/xAODBase
- Event/xAOD/xAODEventInfo
- GaudiKernel
- PhysicsAnalysis/AnalysisCommon/ParticleEvent
- PhysicsAnalysis/D3PDMaker/D3PDMakerInterfaces
- PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
- Reconstruction/Jet/JetEvent )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
find_package( CLHEP )
-find_package( ROOT COMPONENTS Physics Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Physics Core )
# Component(s) in the package:
atlas_add_component( EventCommonD3PDMaker
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel Navigation AthenaPoolUtilities IOVDbDataModel EventBookkeeperMetaData EventKernel FourMomUtils NavFourMom xAODBase xAODEventInfo GaudiKernel ParticleEvent D3PDMakerUtils JetEvent )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel Navigation AthenaPoolUtilities EventBookkeeperMetaData EventKernel FourMomUtils NavFourMom xAODBase xAODEventInfo GaudiKernel ParticleEvent D3PDMakerInterfaces D3PDMakerUtils JetEvent )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/CMakeLists.txt
index cf48ed2ac43..3d9ab004df5 100644
--- a/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/TruthD3PDMaker/CMakeLists.txt
@@ -1,33 +1,10 @@
-################################################################################
-# Package: TruthD3PDMaker
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TruthD3PDMaker )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/Navigation
- Event/EventInfo
- Event/xAOD/xAODTruth
- GaudiKernel
- Generators/GeneratorObjects
- Generators/AtlasHepMC
- Generators/GenInterfaces
- Generators/TruthUtils
- PhysicsAnalysis/D3PDMaker/D3PDMakerInterfaces
- PhysicsAnalysis/D3PDMaker/D3PDMakerUtils
- PhysicsAnalysis/D3PDMaker/TruthD3PDAnalysis
- PhysicsAnalysis/MCTruthClassifier
- PhysicsAnalysis/TruthParticleID/McParticleEvent
- PhysicsAnalysis/TruthParticleID/McParticleKernel
- Reconstruction/Jet/JetEvent
- Tracking/TrkTools/TrkToolInterfaces )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost )
find_package( CLHEP )
find_package( HepPDT )
@@ -36,7 +13,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 GenInterfacesLib )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel Navigation EventInfo xAODTruth GaudiKernel GeneratorObjects TruthUtils D3PDMakerInterfaces D3PDMakerUtils TruthD3PDAnalysisLib MCTruthClassifierLib McParticleEvent McParticleKernel JetEvent TrkToolInterfaces GenInterfacesLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
--
GitLab