diff --git a/Event/xAOD/xAODTrigBphysAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrigBphysAthenaPool/CMakeLists.txt
index 5027e3827403d1848a2f570d42df29082ba7fa60..213f8afe49f2fc302314d2ccae2d89e4b2ed1da3 100644
--- a/Event/xAOD/xAODTrigBphysAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigBphysAthenaPool/CMakeLists.txt
@@ -1,23 +1,12 @@
-################################################################################
-# Package: xAODTrigBphysAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigBphysAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthContainers
- Control/AthenaKernel
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/xAOD/xAODTrigBphys )
-
# Component(s) in the package:
atlas_add_poolcnv_library( xAODTrigBphysAthenaPoolPoolCnv
src/*.cxx
FILES xAODTrigBphys/TrigBphysContainer.h xAODTrigBphys/TrigBphysAuxContainer.h
TYPES_WITH_NAMESPACE xAOD::TrigBphysContainer xAOD::TrigBphysAuxContainer
CNV_PFX xAOD
- LINK_LIBRARIES AthContainers AthenaKernel AthenaPoolCnvSvcLib AthenaPoolUtilities xAODTrigBphys )
-
+ LINK_LIBRARIES AthenaPoolCnvSvcLib xAODTrigBphys )
diff --git a/Event/xAOD/xAODTrigBphysCnv/CMakeLists.txt b/Event/xAOD/xAODTrigBphysCnv/CMakeLists.txt
index 749dbed45f7205ac5ce2d0deaae42798d3418d80..dae581dc7675c970d3f40c18d57dbf2257a6d3d4 100644
--- a/Event/xAOD/xAODTrigBphysCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigBphysCnv/CMakeLists.txt
@@ -1,32 +1,19 @@
-################################################################################
-# Package: xAODTrigBphysCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigBphysCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTrigBphys
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Trigger/TrigEvent/TrigParticle )
-
atlas_add_library( xAODTrigBphysCnvLib
xAODTrigBphysCnv/*.h
INTERFACE
PUBLIC_HEADERS xAODTrigBphysCnv
LINK_LIBRARIES GaudiKernel xAODTrigBphys )
-
# Component(s) in the package:
atlas_add_component( xAODTrigBphysCnv
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES xAODTrigBphysCnvLib xAODTrigBphys GaudiKernel AthenaBaseComps AthenaKernel TrigParticle )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigParticle xAODTrigBphysCnvLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
-
diff --git a/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt b/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
index 1d0af5f488d40a17d955444145ab2968c27076fa..40221bee08af176568ea7ebe10f716fb93306f84 100644
--- a/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
@@ -1,31 +1,19 @@
-################################################################################
-# Package: xAODTrigCaloCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigCaloCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTrigCalo
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Trigger/TrigEvent/TrigCaloEvent )
-
atlas_add_library( xAODTrigCaloCnvLib
xAODTrigCaloCnv/*.h
INTERFACE
PUBLIC_HEADERS xAODTrigCaloCnv
LINK_LIBRARIES GaudiKernel xAODTrigCalo )
-
# Component(s) in the package:
atlas_add_component( xAODTrigCaloCnv
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES xAODTrigCaloCnvLib xAODTrigCalo GaudiKernel AthenaBaseComps AthenaKernel TrigCaloEvent )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigCaloEvent xAODTrigCaloCnvLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Event/xAOD/xAODTrigL1CaloAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrigL1CaloAthenaPool/CMakeLists.txt
index 985dafe746091c407d601f35056f029fc8ae73e7..001dbd74ef28217c7fc0a50203f1811ad03fa9fb 100644
--- a/Event/xAOD/xAODTrigL1CaloAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigL1CaloAthenaPool/CMakeLists.txt
@@ -1,27 +1,12 @@
-################################################################################
-# Package: xAODTrigL1CaloAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigL1CaloAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthContainers
- Control/AthenaKernel
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/xAOD/xAODTrigL1Calo )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_poolcnv_library( xAODTrigL1CaloAthenaPoolPoolCnv
src/*.cxx
FILES xAODTrigL1Calo/JEMHitsContainer.h xAODTrigL1Calo/JEMHitsAuxContainer.h xAODTrigL1Calo/JEMEtSumsContainer.h xAODTrigL1Calo/JEMEtSumsAuxContainer.h xAODTrigL1Calo/JEMRoIContainer.h xAODTrigL1Calo/JEMRoIAuxContainer.h xAODTrigL1Calo/CPMHitsContainer.h xAODTrigL1Calo/CPMHitsAuxContainer.h xAODTrigL1Calo/CPMTowerContainer.h xAODTrigL1Calo/CPMTowerAuxContainer.h xAODTrigL1Calo/CPMRoIContainer.h xAODTrigL1Calo/CPMRoIAuxContainer.h xAODTrigL1Calo/CMMCPHitsContainer.h xAODTrigL1Calo/CMMCPHitsAuxContainer.h xAODTrigL1Calo/CMMEtSumsContainer.h xAODTrigL1Calo/CMMEtSumsAuxContainer.h xAODTrigL1Calo/CMMJetHitsContainer.h xAODTrigL1Calo/CMMJetHitsAuxContainer.h xAODTrigL1Calo/CMMRoI.h xAODTrigL1Calo/CMMRoIAuxInfo.h xAODTrigL1Calo/JetElementContainer.h xAODTrigL1Calo/JetElementAuxContainer.h xAODTrigL1Calo/RODHeaderContainer.h xAODTrigL1Calo/RODHeaderAuxContainer.h xAODTrigL1Calo/TriggerTowerContainer.h xAODTrigL1Calo/TriggerTowerAuxContainer.h xAODTrigL1Calo/CMXCPHitsContainer.h xAODTrigL1Calo/CMXCPHitsAuxContainer.h xAODTrigL1Calo/CMXCPTobContainer.h xAODTrigL1Calo/CMXCPTobAuxContainer.h xAODTrigL1Calo/CMXJetHitsContainer.h xAODTrigL1Calo/CMXJetHitsAuxContainer.h xAODTrigL1Calo/CMXJetTobContainer.h xAODTrigL1Calo/CMXJetTobAuxContainer.h xAODTrigL1Calo/CMXEtSumsContainer.h xAODTrigL1Calo/CMXEtSumsAuxContainer.h xAODTrigL1Calo/CMXRoIContainer.h xAODTrigL1Calo/CMXRoIAuxContainer.h xAODTrigL1Calo/CPMTobRoIContainer.h xAODTrigL1Calo/CPMTobRoIAuxContainer.h xAODTrigL1Calo/JEMTobRoIContainer.h xAODTrigL1Calo/JEMTobRoIAuxContainer.h xAODTrigL1Calo/L1TopoRawDataContainer.h xAODTrigL1Calo/L1TopoRawDataAuxContainer.h
TYPES_WITH_NAMESPACE xAOD::JEMHitsContainer xAOD::JEMHitsAuxContainer xAOD::JEMEtSumsContainer xAOD::JEMEtSumsAuxContainer xAOD::JEMRoIContainer xAOD::JEMRoIAuxContainer xAOD::CPMHitsContainer xAOD::CPMHitsAuxContainer xAOD::CPMTowerContainer xAOD::CPMTowerAuxContainer xAOD::CPMRoIContainer xAOD::CPMRoIAuxContainer xAOD::CMMCPHitsContainer xAOD::CMMCPHitsAuxContainer xAOD::CMMEtSumsContainer xAOD::CMMEtSumsAuxContainer xAOD::CMMJetHitsContainer xAOD::CMMJetHitsAuxContainer xAOD::CMMRoI xAOD::CMMRoIAuxInfo xAOD::JetElementContainer xAOD::JetElementAuxContainer xAOD::RODHeaderContainer xAOD::RODHeaderAuxContainer xAOD::TriggerTowerContainer xAOD::TriggerTowerAuxContainer xAOD::CMXCPHitsContainer xAOD::CMXCPHitsAuxContainer xAOD::CMXCPTobContainer xAOD::CMXCPTobAuxContainer xAOD::CMXJetHitsContainer xAOD::CMXJetHitsAuxContainer xAOD::CMXJetTobContainer xAOD::CMXJetTobAuxContainer xAOD::CMXEtSumsContainer xAOD::CMXEtSumsAuxContainer xAOD::CMXRoIContainer xAOD::CMXRoIAuxContainer xAOD::CPMTobRoIContainer xAOD::CPMTobRoIAuxContainer xAOD::JEMTobRoIContainer xAOD::JEMTobRoIAuxContainer xAOD::L1TopoRawDataContainer xAOD::L1TopoRawDataAuxContainer
CNV_PFX xAOD
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthenaKernel AthenaPoolCnvSvcLib AthenaPoolUtilities xAODTrigL1Calo )
-
+ LINK_LIBRARIES AthContainers AthenaKernel AthenaPoolCnvSvcLib GaudiKernel xAODTrigL1Calo )
diff --git a/Event/xAOD/xAODTrigL1CaloCnv/CMakeLists.txt b/Event/xAOD/xAODTrigL1CaloCnv/CMakeLists.txt
index a0a88146da219b5382910a06ef41f6c768527c49..10a5ded9a648415f0eae2afeed44bdb9080b9d97 100644
--- a/Event/xAOD/xAODTrigL1CaloCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigL1CaloCnv/CMakeLists.txt
@@ -1,27 +1,21 @@
-################################################################################
-# Package: xAODTrigL1CaloCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigL1CaloCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTrigL1Calo
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Trigger/TrigT1/TrigT1CaloEvent )
-
# Component(s) in the package:
+atlas_add_library( xAODTrigL1CaloCnvLib
+ xAODTrigL1CaloCnv/*.h
+ INTERFACE
+ PUBLIC_HEADERS xAODTrigL1CaloCnv
+ LINK_LIBRARIES GaudiKernel xAODTrigL1Calo )
+
atlas_add_component( xAODTrigL1CaloCnv
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES xAODTrigL1Calo GaudiKernel AthenaBaseComps AthenaKernel TrigT1CaloEventLib )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigT1CaloEventLib xAODTrigL1CaloCnvLib )
# Install files from the package:
-atlas_install_headers( xAODTrigL1CaloCnv )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
diff --git a/Event/xAOD/xAODTrigMinBiasAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrigMinBiasAthenaPool/CMakeLists.txt
index e80b9c5749fff0f59f2a73bd1cf76714ddcc1430..a9434c46f4fb1c87d08428d37992cdaf67493a73 100644
--- a/Event/xAOD/xAODTrigMinBiasAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMinBiasAthenaPool/CMakeLists.txt
@@ -1,16 +1,8 @@
-################################################################################
-# Package: xAODTrigMinBiasAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigMinBiasAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/xAOD/xAODTrigMinBias )
-
# Component(s) in the package:
atlas_add_poolcnv_library( xAODTrigMinBiasAthenaPoolPoolCnv
src/*.cxx
diff --git a/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt b/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt
index 1e3d86d02bf7b15987c860ff691b9e6f0d8cac5e..1c68a2ad46ed51ca83109e60dbae69958fa544ec 100644
--- a/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt
@@ -1,32 +1,19 @@
-################################################################################
-# Package: xAODTrigMinBiasCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigMinBiasCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTrigMinBias
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigInDetEvent )
-
atlas_add_library( xAODTrigMinBiasCnvLib
xAODTrigMinBiasCnv/*.h
INTERFACE
PUBLIC_HEADERS xAODTrigMinBiasCnv
LINK_LIBRARIES GaudiKernel xAODTrigMinBias )
-
# Component(s) in the package:
atlas_add_component( xAODTrigMinBiasCnv
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES xAODTrigMinBiasCnvLib xAODTrigMinBias GaudiKernel AthenaBaseComps AthenaKernel TrigCaloEvent TrigInDetEvent )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigCaloEvent TrigInDetEvent xAODTrigMinBiasCnvLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt b/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt
index 996cd386454a797688efb1ce0e0b65b06a049175..d2ec3e0748cb6c35f728becf62006bcf0361f587 100644
--- a/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt
@@ -1,31 +1,19 @@
-################################################################################
-# Package: xAODTrigMissingETCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigMissingETCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTrigMissingET
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Trigger/TrigEvent/TrigMissingEtEvent )
-
atlas_add_library( xAODTrigMissingETCnvLib
xAODTrigMissingETCnv/*.h
INTERFACE
PUBLIC_HEADERS xAODTrigMissingETCnv
- LINK_LIBRARIES GaudiKernel xAODTrigMissingET xAODCore )
-
+ LINK_LIBRARIES GaudiKernel xAODTrigMissingET )
# Component(s) in the package:
atlas_add_component( xAODTrigMissingETCnv
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES xAODTrigMissingETCnvLib xAODTrigMissingET GaudiKernel AthenaBaseComps AthenaKernel TrigMissingEtEvent )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigMissingEtEvent xAODTrigMissingETCnvLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt b/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt
index f5a08b0976a4f1fbd1898fcced17e1cba6adec77..b9a603df5ea5d7a5bc07433b7541891498db23d5 100644
--- a/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt
@@ -1,35 +1,19 @@
-################################################################################
-# Package: xAODTrigMuonCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigMuonCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigMuon
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/AthLinks
- Event/FourMomUtils
- Trigger/TrigEvent/TrigMuonEvent )
-
atlas_add_library( xAODTrigMuonCnvLib
xAODTringMuonCnv/*.h
INTERFACE
PUBLIC_HEADERS xAODTrigMuonCnv
LINK_LIBRARIES GaudiKernel xAODTrigMuon xAODMuon xAODTracking )
-
# Component(s) in the package:
atlas_add_component( xAODTrigMuonCnv
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES xAODTrigMuonCnvLib xAODMuon xAODTracking xAODTrigMuon GaudiKernel AthenaBaseComps AthenaKernel AthLinks FourMomUtils TrigMuonEvent )
+ LINK_LIBRARIES AthLinks AthenaBaseComps AthenaKernel FourMomUtils TrigMuonEvent xAODTrigMuonCnvLib )
# Install files from the package:
atlas_install_python_modules( python/xAODTrigMuonCnvConfig.py python/xAODTrigMuonCnvConfigDb.py )
diff --git a/Event/xAOD/xAODTriggerCnv/CMakeLists.txt b/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
index b4ebe224944dd2392132da7bded34f4d10ea9bb6..6dc5bfbac1f21b90276be590e316827a883fc182 100644
--- a/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
@@ -1,50 +1,23 @@
-# $Id: CMakeLists.txt 782320 2016-11-04 10:28:41Z krasznaa $
-################################################################################
-# Package: xAODTriggerCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTriggerCnv )
# Extra dependencies, based on the build environment:
if( XAOD_STANDALONE )
- set( extra_deps PRIVATE Control/xAODRootAccess )
set( interface_extra_libs )
elseif( XAOD_ANALYSIS )
- set( extra_deps GaudiKernel Control/AthenaKernel )
set( interface_extra_libs GaudiKernel )
else()
- set( extra_deps GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Event/EventInfo
- PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
- Trigger/TrigAnalysis/TrigAnalysisInterfaces
- Trigger/TrigConfiguration/TrigConfHLTData
- Trigger/TrigConfiguration/TrigConfInterfaces
- Trigger/TrigEvent/TrigDecisionEvent
- Trigger/TrigEvent/TrigDecisionInterface
- Trigger/TrigEvent/TrigSteeringEvent )
set( interface_extra_libs GaudiKernel )
endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODTrigger
- ${extra_deps} )
-
atlas_add_library( xAODTriggerCnvLib
xAODTriggerCnv/*.h
INTERFACE
PUBLIC_HEADERS xAODTriggerCnv
LINK_LIBRARIES ${interface_extra_libs} xAODTrigger AsgTools )
-
# Build the package differently in standalone and Athena modes:
if( XAOD_STANDALONE )