diff --git a/Trigger/TrigEvent/TrigBSExtraction/CMakeLists.txt b/Trigger/TrigEvent/TrigBSExtraction/CMakeLists.txt
index 10c01220bf6ae397ebdb3e6b7ea12e57980f9fcb..9ff61e1eeb169030a2dde3e8b018bb6ed51a3c06 100644
--- a/Trigger/TrigEvent/TrigBSExtraction/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigBSExtraction/CMakeLists.txt
@@ -1,64 +1,13 @@
-cmake_minimum_required( VERSION 3.2 )
-################################################################################
-# Package: TrigBSExtraction
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigBSExtraction )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/StoreGate
- Event/xAOD/xAODJetCnv
- Event/xAOD/xAODTrackingCnv
- Event/xAOD/xAODTrigBphysCnv
- Event/xAOD/xAODTrigCaloCnv
- Event/xAOD/xAODBTaggingCnv
- Event/xAOD/xAODTrigMinBiasCnv
- Event/xAOD/xAODTrigMissingETCnv
- Event/xAOD/xAODTrigMuonCnv
- Event/xAOD/xAODTauCnv
- Event/xAOD/xAODEgammaCnv
- Event/xAOD/xAODTriggerCnv
- Event/xAOD/xAODCaloEventCnv
- GaudiKernel
- Trigger/TrigDataAccess/TrigSerializeCnvSvc
- Trigger/TrigEvent/TrigNavigation
- Trigger/TrigEvent/TrigSteeringEvent
- PRIVATE
- Event/xAOD/xAODJet
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigBphys
- Event/xAOD/xAODTrigCalo
- Event/xAOD/xAODTrigMinBias
- Event/xAOD/xAODTrigMissingET
- Event/xAOD/xAODTrigMuon
- Event/xAOD/xAODTau
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODTrigger
- Event/xAOD/xAODBTagging
- Reconstruction/Jet/JetEvent
- Reconstruction/Particle
- Reconstruction/tauEvent
- Reconstruction/egamma/egammaEvent
- Tracking/TrkEvent/TrkTrack
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigMissingEtEvent
- Trigger/TrigEvent/TrigMuonEvent
- Trigger/TrigEvent/TrigParticle
- Trigger/TrigEvent/TrigStorageDefinitions )
-
# Component(s) in the package:
atlas_add_component( TrigBSExtraction
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests GaudiKernel TrigSerializeCnvSvcLib TrigNavigationLib TrigSteeringEvent xAODJet xAODMuon xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTau xAODEgamma xAODCaloEvent xAODTrigger xAODBTagging JetEvent Particle tauEvent egammaEvent CaloEvent TrkTrack TrigCaloEvent TrigInDetEvent TrigMissingEtEvent TrigMuonEvent TrigParticle TrigStorageDefinitions xAODTauCnvLib xAODTrigMuonCnvLib xAODJetCnvLib xAODTrigCaloCnvLib xAODBTaggingCnvLib xAODTrigBphysCnvLib xAODTrigMissingETCnvLib xAODTrigMinBiasCnvLib xAODEgammaCnvLib xAODCaloEventCnvLib xAODTriggerCnvLib )
+ LINK_LIBRARIES AthenaBaseComps CaloEvent GaudiKernel JetEvent Particle StoreGateLib TrigCaloEvent TrigInDetEvent TrigMissingEtEvent TrigMuonEvent TrigNavigationLib TrigParticle TrigSerializeCnvSvcLib TrigSteeringEvent TrigStorageDefinitions TrkTrack egammaEvent tauEvent xAODBTagging xAODBTaggingCnvLib xAODCaloEvent xAODCaloEventCnvLib xAODEgamma xAODEgammaCnvLib xAODJet xAODJetCnvLib xAODMuon xAODTau xAODTauCnvLib xAODTracking xAODTrackingCnvLib xAODTrigBphys xAODTrigBphysCnvLib xAODTrigCalo xAODTrigCaloCnvLib xAODTrigMinBias xAODTrigMinBiasCnvLib xAODTrigMissingET xAODTrigMissingETCnvLib xAODTrigMuon xAODTrigMuonCnvLib xAODTrigger xAODTriggerCnvLib )
# Install files from the package:
-atlas_install_headers( TrigBSExtraction )
atlas_install_joboptions( share/*.py )
-
diff --git a/Trigger/TrigEvent/TrigDecisionEvent/CMakeLists.txt b/Trigger/TrigEvent/TrigDecisionEvent/CMakeLists.txt
index 298134a1ca5cf75f1cba8818e74d481f82d5c405..e45de145910bc354d02f460622cf6bfc7147816f 100644
--- a/Trigger/TrigEvent/TrigDecisionEvent/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigDecisionEvent/CMakeLists.txt
@@ -1,33 +1,17 @@
-################################################################################
-# Package: TrigDecisionEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigDecisionEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthLinks
- Trigger/TrigEvent/TrigSteeringEvent
- PRIVATE
- AtlasTest/TestTools )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( TrigDecisionEvent
src/*.cxx
PUBLIC_HEADERS TrigDecisionEvent
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthLinks AthenaKernel TrigSteeringEvent
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools )
+ LINK_LIBRARIES AthLinks AthenaKernel TrigSteeringEvent )
atlas_add_dictionary( TrigDecisionEventDict
TrigDecisionEvent/TrigDecisionEventDict.h
TrigDecisionEvent/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks AthenaKernel TrigSteeringEvent TestTools TrigDecisionEvent
+ LINK_LIBRARIES TrigDecisionEvent
DATA_LINKS HLT::HLTResult )
diff --git a/Trigger/TrigEvent/TrigDecisionEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigDecisionEventTPCnv/CMakeLists.txt
index 65a72e8e111aed23b1eff26cdf7eedf3b501aa51..0a9874d4f9f44ff6bfae057b1f1c90e8cce29c3c 100644
--- a/Trigger/TrigEvent/TrigDecisionEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigDecisionEventTPCnv/CMakeLists.txt
@@ -1,72 +1,46 @@
-################################################################################
-# Package: TrigDecisionEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigDecisionEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/DataModelAthenaPool
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Trigger/TrigEvent/TrigSteeringEventTPCnv
- PRIVATE
- AtlasTest/TestTools
- Control/AthenaKernel
- Control/SGTools
- GaudiKernel
- Trigger/TrigEvent/TrigDecisionEvent
- Trigger/TrigEvent/TrigSteeringEvent )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_tpcnv_library( TrigDecisionEventTPCnv
src/*.cxx
PUBLIC_HEADERS TrigDecisionEventTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent )
+ LINK_LIBRARIES AthenaPoolCnvSvcLib DataModelAthenaPoolLib TrigDecisionEvent TrigSteeringEventTPCnv
+ PRIVATE_LINK_LIBRARIES AthenaKernel )
atlas_add_dictionary( TrigDecisionEventTPCnvDict
TrigDecisionEventTPCnv/TrigDecisionEventTPCnvDict.h
TrigDecisionEventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
atlas_add_dictionary( OLD_TrigDecisionEventTPCnvDict
TrigDecisionEventTPCnv/TrigDecisionEventTPCnvDict.h
TrigDecisionEventTPCnv/OLD_selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p1_test
SOURCES
test/TrigDecisionCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p2_test
SOURCES
test/TrigDecisionCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p3_test
SOURCES
test/TrigDecisionCnv_p3_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p4_test
SOURCES
test/TrigDecisionCnv_p4_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p5_test
SOURCES
test/TrigDecisionCnv_p5_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
-
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
diff --git a/Trigger/TrigEvent/TrigNavStructure/CMakeLists.txt b/Trigger/TrigEvent/TrigNavStructure/CMakeLists.txt
index 2219f6bee9c37dd24d22f7218ba9f6d81439f897..3ae61fe8dd4bba0cf54a0ebb689a02ba388497aa 100644
--- a/Trigger/TrigEvent/TrigNavStructure/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigNavStructure/CMakeLists.txt
@@ -1,26 +1,23 @@
-################################################################################
-# Package: TrigNavStructure
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigNavStructure )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthContainers
- Control/AthToolSupport/AsgTools
- Control/CxxUtils )
-
# External dependencies:
find_package( Boost COMPONENTS regex )
+# Extra dependencies, based on the build environment:
+set( extra_libs )
+if( NOT XAOD_STANDALONE )
+ set( extra_libs StoreGateLib )
+endif()
+
# The library of the package:
atlas_add_library( TrigNavStructure
TrigNavStructure/*.h Root/*.cxx
PUBLIC_HEADERS TrigNavStructure
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthContainers AsgTools )
+ LINK_LIBRARIES ${Boost_LIBRARIES} AsgTools AthContainers CxxUtils xAODCore ${extra_libs} )
# Test(s) in the package:
foreach( test_name ut_iterators_test ut_build_trignav_test ut_features_test
diff --git a/Trigger/TrigEvent/TrigNavTools/CMakeLists.txt b/Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
index bd2856ddb4c483a245915cad3d49b07f84d7362e..b5caeda5c6571d0f64c1d1c9a330358209462111 100644
--- a/Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
@@ -1,39 +1,18 @@
-################################################################################
-# Package: TrigNavTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigNavTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Trigger/TrigAnalysis/TrigDecisionTool
- Trigger/TrigEvent/TrigNavigation
- PRIVATE
- Control/StoreGate
- Event/xAOD/xAODTrigger
- GaudiKernel
- PhysicsAnalysis/DerivationFramework/DerivationFrameworkInterfaces
- Trigger/TrigConfiguration/TrigConfHLTData
- Trigger/TrigEvent/TrigSteeringEvent )
-
-# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-
# Component(s) in the package:
atlas_add_library( TrigNavToolsLib
src/*.cxx
PUBLIC_HEADERS TrigNavTools
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigDecisionToolLib TrigNavigationLib StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} xAODTrigger GaudiKernel TrigConfHLTData TrigSteeringEvent DerivationFrameworkInterfaces )
+ PRIVATE_LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigConfHLTData TrigSteeringEvent xAODTrigger
+ LINK_LIBRARIES GaudiKernel TrigDecisionToolLib TrigNavigationLib )
atlas_add_component( TrigNavTools
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel TrigDecisionToolLib TrigNavigationLib StoreGateLib SGtests xAODTrigger GaudiKernel TrigConfHLTData TrigSteeringEvent TrigNavToolsLib DerivationFrameworkInterfaces )
+ LINK_LIBRARIES TrigNavToolsLib )
# Install files from the package:
atlas_install_python_modules( python/__init__.py python/TrigNavToolsConfig.py )
diff --git a/Trigger/TrigEvent/TrigNavTools/doc/packagedoc.h b/Trigger/TrigEvent/TrigNavTools/doc/packagedoc.h
deleted file mode 100644
index 037ffc7ab18810ee8b1b23eb1251476c68ad3144..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigNavTools/doc/packagedoc.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-
-@page TrigNavTools_page TrigNavTools package
-
-@section TrigNavTools_TrigNavToolsIntro Introduction
-
-*/
diff --git a/Trigger/TrigEvent/TrigNavigation/CMakeLists.txt b/Trigger/TrigEvent/TrigNavigation/CMakeLists.txt
index 92f7d6538e375a4f1ec703ae9c2182f55cf64a84..f5a1e179ffdbde7eb0f33817fd6cf96a6801aa4b 100644
--- a/Trigger/TrigEvent/TrigNavigation/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigNavigation/CMakeLists.txt
@@ -1,36 +1,8 @@
-# $Id: CMakeLists.txt 783840 2016-11-12 17:28:04Z ssnyder $
-################################################################################
-# Package: TrigNavigation
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigNavigation )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/CxxUtils
- Control/AthContainers
- Control/AthLinks
- Control/AthToolSupport/AsgTools
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/SGTools
- Control/StoreGate
- GaudiKernel
- Trigger/TrigEvent/TrigNavStructure
- Trigger/TrigEvent/TrigStorageDefinitions
- PRIVATE
- AtlasTest/TestTools
- Control/AthContainersInterfaces
- Control/AthContainersRoot
- Control/RootUtils
- Control/CxxUtils
- Event/xAOD/xAODCore
- Trigger/TrigConfiguration/TrigConfHLTData
- Trigger/TrigDataAccess/TrigSerializeCnvSvc
- Trigger/TrigDataAccess/TrigSerializeResult )
-
# External dependencies:
find_package( Boost COMPONENTS regex )
diff --git a/Trigger/TrigEvent/TrigRoiConversion/CMakeLists.txt b/Trigger/TrigEvent/TrigRoiConversion/CMakeLists.txt
index 651bc637e716b426604c8a1dd38324a46bb8511d..bad330263138a3c226120997c1a530ca4fb0e757 100644
--- a/Trigger/TrigEvent/TrigRoiConversion/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigRoiConversion/CMakeLists.txt
@@ -1,26 +1,8 @@
-# $Id: CMakeLists.txt 789262 2016-12-12 13:15:37Z krasznaa $
-################################################################################
-# Package: TrigRoiConversion
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigRoiConversion )
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-if( NOT XAOD_STANDALONE )
- set( extra_deps Control/AthenaBaseComps GaudiKernel )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Trigger/TrigEvent/TrigSteeringEvent
- PRIVATE
- Event/xAOD/xAODTrigger
- ${extra_deps} )
-
# Component(s) in the package:
atlas_add_library( TrigRoiConversionLib
TrigRoiConversion/*.h Root/*.cxx
@@ -31,6 +13,5 @@ atlas_add_library( TrigRoiConversionLib
if( NOT XAOD_STANDALONE )
atlas_add_component( TrigRoiConversion
src/*.h src/*.cxx src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel xAODTrigger
- TrigRoiConversionLib )
+ LINK_LIBRARIES AthenaBaseComps TrigRoiConversionLib xAODTrigger )
endif()
diff --git a/Trigger/TrigEvent/TrigStorageDefinitions/CMakeLists.txt b/Trigger/TrigEvent/TrigStorageDefinitions/CMakeLists.txt
index 2e711949857ca34142f6fc29caa3101cc2e54cac..80309d4e48dcd459a3ca92e4ea4cca8ea98774a2 100644
--- a/Trigger/TrigEvent/TrigStorageDefinitions/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigStorageDefinitions/CMakeLists.txt
@@ -1,65 +1,33 @@
-################################################################################
-# Package: TrigStorageDefinitions
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigStorageDefinitions )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthLinks
- Control/AthContainers
- Control/Navigation
- Event/xAOD/xAODBTagging
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODHIEvent
- Event/xAOD/xAODJet
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTau
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigBphys
- Event/xAOD/xAODTrigCalo
- Event/xAOD/xAODTrigEgamma
- Event/xAOD/xAODTrigL1Calo
- Event/xAOD/xAODTrigMinBias
- Event/xAOD/xAODTrigMissingET
- Event/xAOD/xAODTrigMuon
- Event/xAOD/xAODTrigRinger
- Event/xAOD/xAODTrigger
- PRIVATE
- AtlasTest/TestTools )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost )
# Component(s) in the package:
atlas_add_library( TrigStorageDefinitions
PUBLIC_HEADERS TrigStorageDefinitions
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthLinks AthContainers Navigation xAODBTagging xAODCaloEvent xAODEgamma xAODHIEvent xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigL1Calo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTrigRinger xAODTrigger )
+ LINK_LIBRARIES AthLinks AthContainers Navigation xAODBTagging xAODCaloEvent xAODEgamma xAODHIEvent xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigL1Calo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTrigRinger xAODTrigger )
atlas_add_test( TypeInformation_test
SOURCES
test/TypeInformation_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthLinks AthContainers Navigation xAODBTagging xAODCaloEvent xAODEgamma xAODHIEvent xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigL1Calo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTrigRinger xAODTrigger TestTools TrigStorageDefinitions )
+ LINK_LIBRARIES TrigStorageDefinitions )
atlas_add_test( ListMap_test
SOURCES
test/ListMap_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthLinks AthContainers Navigation xAODBTagging xAODCaloEvent xAODEgamma xAODHIEvent xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigL1Calo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTrigRinger xAODTrigger TestTools TrigStorageDefinitions )
+ LINK_LIBRARIES TrigStorageDefinitions )
atlas_add_test( NewEDMMap_test
SOURCES
test/NewEDMMap_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthLinks AthContainers Navigation xAODBTagging xAODCaloEvent xAODEgamma xAODHIEvent xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigL1Calo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTrigRinger xAODTrigger TestTools TrigStorageDefinitions )
+ LINK_LIBRARIES TrigStorageDefinitions )
atlas_add_test( Basic_test
SOURCES
test/Basic_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthLinks AthContainers Navigation xAODBTagging xAODCaloEvent xAODEgamma xAODHIEvent xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigL1Calo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTrigRinger xAODTrigger TestTools TrigStorageDefinitions )
-
+ LINK_LIBRARIES TrigStorageDefinitions )
diff --git a/Trigger/TrigEvent/TrigTopoEvent/CMakeLists.txt b/Trigger/TrigEvent/TrigTopoEvent/CMakeLists.txt
index 5070e5de010768fb5b24a6a3e94957de3d26f454..3bd770f85f9fdf3b3ea62e6994d0b215c1611693 100644
--- a/Trigger/TrigEvent/TrigTopoEvent/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigTopoEvent/CMakeLists.txt
@@ -1,47 +1,22 @@
-################################################################################
-# Package: TrigTopoEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigTopoEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthContainers
- Control/AthenaKernel
- GaudiKernel
- Reconstruction/egamma/egammaEvent
- Reconstruction/tauEvent
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigMuonEvent
- Trigger/TrigEvent/TrigParticle
- PRIVATE
- Event/EventPrimitives
- Trigger/TrigDataAccess/TrigSerializeCnvSvc
- Trigger/TrigEvent/TrigNavigation )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( TrigTopoEvent
src/*.cxx
PUBLIC_HEADERS TrigTopoEvent
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthContainers AthenaKernel GaudiKernel egammaEvent tauEvent TrigCaloEvent TrigInDetEvent TrigMuonEvent TrigParticle TrigSerializeCnvSvcLib TrigNavigationLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} EventPrimitives )
+ LINK_LIBRARIES AthContainers AthenaKernel GaudiKernel TrigMuonEvent TrigParticle egammaEvent tauEvent
+ PRIVATE_LINK_LIBRARIES CxxUtils EventPrimitives TrigNavigationLib )
atlas_add_sercnv_library( TrigTopoEventSerCnv
FILES TrigTopoEvent/ElectronMuonTopoInfo.h TrigTopoEvent/ElectronMuonTopoInfoContainer.h
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthenaKernel GaudiKernel egammaEvent tauEvent TrigCaloEvent TrigInDetEvent TrigMuonEvent TrigParticle EventPrimitives TrigSerializeCnvSvcLib TrigNavigationLib TrigTopoEvent )
+ LINK_LIBRARIES TrigTopoEvent )
atlas_add_dictionary( TrigTopoEventDict
TrigTopoEvent/TrigTopoEventDict.h
TrigTopoEvent/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthenaKernel GaudiKernel egammaEvent tauEvent TrigCaloEvent TrigInDetEvent TrigMuonEvent TrigParticle EventPrimitives TrigSerializeCnvSvcLib TrigNavigationLib TrigTopoEvent
+ LINK_LIBRARIES TrigTopoEvent
DATA_LINKS ElectronMuonTopoInfo
ELEMENT_LINKS ElectronMuonTopoInfoContainer )
-
diff --git a/Trigger/TrigEvent/TrigTopoEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigTopoEventTPCnv/CMakeLists.txt
index cee2945086cff936e38750e9d5b06647692b12cc..cd6b0fc948bf6d1d4e02fbd5c8f5d6f25beb4fcb 100644
--- a/Trigger/TrigEvent/TrigTopoEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigTopoEventTPCnv/CMakeLists.txt
@@ -1,40 +1,21 @@
-################################################################################
-# Package: TrigTopoEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigTopoEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Trigger/TrigEvent/TrigTopoEvent
- PRIVATE
- AtlasTest/TestTools
- Control/AthenaKernel
- GaudiKernel )
-
-# External dependencies:
-find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_tpcnv_library( TrigTopoEventTPCnv
src/*.cxx
PUBLIC_HEADERS TrigTopoEventTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaPoolCnvSvcLib TrigTopoEvent TestTools AthenaKernel GaudiKernel )
+ PRIVATE_LINK_LIBRARIES AthenaKernel
+ LINK_LIBRARIES AthenaPoolCnvSvcLib TrigTopoEvent )
atlas_add_dictionary( TrigTopoEventTPCnvDict
TrigTopoEventTPCnv/TrigTopoEventTPCnvDict.h
TrigTopoEventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaPoolCnvSvcLib TrigTopoEvent TestTools AthenaKernel GaudiKernel TrigTopoEventTPCnv )
+ LINK_LIBRARIES TrigTopoEventTPCnv )
atlas_add_test( ElectronMuonTopoInfoCnv_p1_test
SOURCES
test/ElectronMuonTopoInfoCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaPoolCnvSvcLib TrigTopoEvent TestTools AthenaKernel GaudiKernel TrigTopoEventTPCnv )
-
+ LINK_LIBRARIES TrigTopoEventTPCnv )
diff --git a/Trigger/TrigEvent/TrigTopoEventTPCnv/test/ElectronMuonTopoInfoCnv_p1_test.cxx b/Trigger/TrigEvent/TrigTopoEventTPCnv/test/ElectronMuonTopoInfoCnv_p1_test.cxx
index a34d9790a3a489b51abb300a10c1f73aa7f74f38..feea234943253edb0f7372a234973474ae477ab5 100644
--- a/Trigger/TrigEvent/TrigTopoEventTPCnv/test/ElectronMuonTopoInfoCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigTopoEventTPCnv/test/ElectronMuonTopoInfoCnv_p1_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id$
@@ -15,7 +15,6 @@
#include "TrigTopoEventTPCnv/ElectronMuonTopoInfoCnv_p1.h"
#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
-#include "CLHEP/Vector/ThreeVector.h"
#include <cassert>
#include <iostream>