diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigMuonEF/CMakeLists.txt
index b4d44525712479d9df5349758adda2397009d6d3..4666a30d42d0582faaec3002070f68ced0c7afe1 100644
--- a/Trigger/TrigAlgorithms/TrigMuonEF/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/CMakeLists.txt
@@ -68,7 +68,7 @@ atlas_add_component( TrigMuonEF
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} TrigMuonEvent TrigSteeringEvent CaloEvent AthenaBaseComps AthenaKernel StoreGateLib SGtests IRegionSelector EventPrimitives FourMomUtils xAODCaloEvent xAODMuon xAODTracking GaudiKernel MuonReadoutGeometry MuonIdHelpersLib CscClusterizationLib MuonPattern MuonPrepRawData MuonRIO_OnTrack MuonSegment MuonRecToolInterfaces MuidInterfaces MuonCombinedEvent MuonCombinedToolInterfaces Particle PATCoreLib RecoToolInterfaces TrkEventPrimitives TrkParameters TrkSegment TrkTrack TrkTrackSummary TrkToolInterfaces TrigConfHLTData TrigCaloEvent TrigInDetEvent TrigNavigationLib DecisionHandlingLib TrigInterfacesLib TrigTimeAlgsLib TrigCompositeUtilsLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} TrigMuonEvent TrigSteeringEvent CaloEvent AthenaBaseComps AthenaKernel StoreGateLib SGtests IRegionSelector EventPrimitives FourMomUtils xAODCaloEvent xAODMuon xAODTracking GaudiKernel MuonReadoutGeometry MuonIdHelpersLib CscClusterizationLib MuonPattern MuonPrepRawData MuonRIO_OnTrack MuonSegment MuonRecToolInterfaces MuidInterfaces MuonCombinedEvent MuonCombinedToolInterfaces Particle PATCoreLib RecoToolInterfaces TrkEventPrimitives TrkParameters TrkSegment TrkTrack TrkTrackSummary TrkToolInterfaces TrigConfHLTData TrigCaloEvent TrigInDetEvent TrigNavigationLib DecisionHandlingLib TrigInterfacesLib TrigTimeAlgsLib TrigCompositeUtilsLib MuonCnvToolInterfacesLib )
# Install files from the package:
atlas_install_python_modules( python/TrigMuonEFConfig.py python/TrigMuonEFCosmicConfig.py python/TrigMuonEFMonitoring.py python/TrigMuonEFConfigDb.py )
diff --git a/Trigger/TrigEvent/TrigCombinedEvent/CMakeLists.txt b/Trigger/TrigEvent/TrigCombinedEvent/CMakeLists.txt
index 55941b0bd1b3bb29269a4fe87e2343f8400c013b..8724a6ff9858529031c63e354c5d7615e56f84e8 100644
--- a/Trigger/TrigEvent/TrigCombinedEvent/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigCombinedEvent/CMakeLists.txt
@@ -1,50 +1,31 @@
-################################################################################
-# Package: TrigCombinedEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigCombinedEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthContainers
- GaudiKernel
- Trigger/TrigEvent/TrigNavigation
- PRIVATE
- AtlasTest/TestTools
- Control/AthenaKernel
- Trigger/TrigDataAccess/TrigSerializeCnvSvc )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost )
# Component(s) in the package:
atlas_add_library( TrigCombinedEvent
src/*.cxx
PUBLIC_HEADERS TrigCombinedEvent
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthContainers AthenaKernel GaudiKernel TrigNavigationLib TrigSerializeCnvSvcLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools AthenaKernel )
+ LINK_LIBRARIES AthContainers AthenaKernel GaudiKernel TrigNavigationLib TrigSerializeCnvSvcLib )
atlas_add_sercnv_library( TrigCombinedEventSerCnv
FILES TrigCombinedEvent/TrigComposite.h TrigCombinedEvent/TrigCompositeContainer.h
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaKernel GaudiKernel TrigNavigationLib TestTools AthenaKernel TrigSerializeCnvSvcLib TrigCombinedEvent )
+ LINK_LIBRARIES TrigCombinedEvent )
atlas_add_dictionary( TrigCombinedEventDict
TrigCombinedEvent/TrigCombinedEventDict.h
TrigCombinedEvent/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaKernel GaudiKernel TrigNavigationLib TestTools AthenaKernel TrigSerializeCnvSvcLib TrigCombinedEvent
+ LINK_LIBRARIES TrigCombinedEvent
DATA_LINKS TrigComposite
ELEMENT_LINKS TrigCompositeContainer )
atlas_add_test( TrigComposite_test
SOURCES
test/TrigComposite_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaKernel GaudiKernel TrigNavigationLib TestTools AthenaKernel TrigSerializeCnvSvcLib TrigCombinedEvent
+ LINK_LIBRARIES TrigCombinedEvent
POST_EXEC_SCRIPT nopost.sh )
diff --git a/Trigger/TrigEvent/TrigCombinedEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigCombinedEventTPCnv/CMakeLists.txt
index cd3cf2c3b2aad7e88e64638280bff7fcf338a832..86dcdcf78bd10df0b1e2c4eb77e52b86837d800b 100644
--- a/Trigger/TrigEvent/TrigCombinedEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigCombinedEventTPCnv/CMakeLists.txt
@@ -1,41 +1,24 @@
-################################################################################
-# Package: TrigCombinedEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigCombinedEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Trigger/TrigEvent/TrigCombinedEvent
- Trigger/TrigEvent/TrigNavigation
- PRIVATE
- AtlasTest/TestTools
- Control/AthenaKernel
- GaudiKernel )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost )
# Component(s) in the package:
atlas_add_tpcnv_library( TrigCombinedEventTPCnv
src/*.cxx
PUBLIC_HEADERS TrigCombinedEventTPCnv
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCombinedEvent TrigNavigationLib TestTools AthenaKernel GaudiKernel )
+ PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCombinedEvent TrigNavigationLib TestTools AthenaKernel GaudiKernel )
atlas_add_dictionary( TrigCombinedEventTPCnvDict
TrigCombinedEventTPCnv/TrigCombinedEventTPCnvDict.h
TrigCombinedEventTPCnv/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCombinedEvent TrigNavigationLib TestTools AthenaKernel GaudiKernel TrigCombinedEventTPCnv )
+ LINK_LIBRARIES TrigCombinedEventTPCnv )
atlas_add_test( TrigCompositeCnv_p1_test
SOURCES
test/TrigCompositeCnv_p1_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigCombinedEvent TrigNavigationLib TestTools AthenaKernel GaudiKernel TrigCombinedEventTPCnv )
-
+ LINK_LIBRARIES TrigCombinedEventTPCnv )
diff --git a/Trigger/TrigEvent/TrigDecisionEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigDecisionEventTPCnv/CMakeLists.txt
index 0a9874d4f9f44ff6bfae057b1f1c90e8cce29c3c..bd6dffa70cf74743aa63ddc2d3c9882e144704dd 100644
--- a/Trigger/TrigEvent/TrigDecisionEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigDecisionEventTPCnv/CMakeLists.txt
@@ -23,24 +23,24 @@ atlas_add_dictionary( OLD_TrigDecisionEventTPCnvDict
atlas_add_test( TrigDecisionCnv_p1_test
SOURCES
test/TrigDecisionCnv_p1_test.cxx
- LINK_LIBRARIES TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TestTools TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p2_test
SOURCES
test/TrigDecisionCnv_p2_test.cxx
- LINK_LIBRARIES TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TestTools TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p3_test
SOURCES
test/TrigDecisionCnv_p3_test.cxx
- LINK_LIBRARIES TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TestTools TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p4_test
SOURCES
test/TrigDecisionCnv_p4_test.cxx
- LINK_LIBRARIES TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TestTools TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p5_test
SOURCES
test/TrigDecisionCnv_p5_test.cxx
- LINK_LIBRARIES TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TestTools TrigDecisionEventTPCnv )
diff --git a/Trigger/TrigEvent/TrigDecisionInterface/CMakeLists.txt b/Trigger/TrigEvent/TrigDecisionInterface/CMakeLists.txt
index 8666b715d2922d9409502ca4f497e7175bbccd2d..6f7830f94923f1f4217c2f93ba4ec3cec9686db6 100644
--- a/Trigger/TrigEvent/TrigDecisionInterface/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigDecisionInterface/CMakeLists.txt
@@ -1,16 +1,8 @@
-# $Id: CMakeLists.txt 750298 2016-05-27 13:03:48Z krasznaa $
-################################################################################
-# Package: TrigDecisionInterface
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigDecisionInterface )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools )
-
# Define an interface library for the header(s):
atlas_add_library( TrigDecisionInterface
TrigDecisionInterface/*.h
diff --git a/Trigger/TrigEvent/TrigMonitoringEvent/CMakeLists.txt b/Trigger/TrigEvent/TrigMonitoringEvent/CMakeLists.txt
index 115fa26d2ee993494adbd6a507b5c5e68b4712a8..fa45d12191ee7c8aec3501c5b6907cff184ed78f 100644
--- a/Trigger/TrigEvent/TrigMonitoringEvent/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigMonitoringEvent/CMakeLists.txt
@@ -1,41 +1,20 @@
-################################################################################
-# Package: TrigMonitoringEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigMonitoringEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthContainers
- Trigger/TrigEvent/TrigSteeringEvent
- PRIVATE
- Control/AthenaKernel
- Trigger/TrigDataAccess/TrigSerializeCnvSvc
- Trigger/TrigEvent/TrigNavigation )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-find_package( tdaq-common )
-
# Component(s) in the package:
atlas_add_library( TrigMonitoringEvent
src/*.cxx
PUBLIC_HEADERS TrigMonitoringEvent
- INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthContainers TrigSteeringEvent TrigSerializeCnvSvcLib TrigNavigationLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel )
+ LINK_LIBRARIES AthContainers AthenaKernel TrigSerializeCnvSvcLib
+ PRIVATE_LINK_LIBRARIES TrigNavigationLib )
atlas_add_sercnv_library( TrigMonitoringEventSerCnv
FILES TrigMonitoringEvent/TrigMonEvent.h TrigMonitoringEvent/TrigMonEventCollection.h TrigMonitoringEvent/TrigMonConfig.h TrigMonitoringEvent/TrigMonConfigCollection.h
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthContainers TrigSteeringEvent AthenaKernel TrigSerializeCnvSvcLib TrigNavigationLib TrigMonitoringEvent )
+ LINK_LIBRARIES TrigMonitoringEvent )
atlas_add_dictionary( TrigMonitoringEventDict
TrigMonitoringEvent/TrigMonitoringEventDict.h
TrigMonitoringEvent/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthContainers TrigSteeringEvent AthenaKernel TrigSerializeCnvSvcLib TrigNavigationLib TrigMonitoringEvent )
-
+ LINK_LIBRARIES TrigMonitoringEvent )
diff --git a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/CMakeLists.txt
index 4e3ae0cc7829f63d1915eb85ce9cef398f2c09c4..fcf8d23fdafbff89f410877ce8d15a41def9c311 100644
--- a/Trigger/TrigEvent/TrigMonitoringEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigMonitoringEventTPCnv/CMakeLists.txt
@@ -1,97 +1,38 @@
-################################################################################
-# Package: TrigMonitoringEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigMonitoringEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Trigger/TrigEvent/TrigMonitoringEvent
- PRIVATE
- AtlasTest/TestTools
- Control/AthenaKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_tpcnv_library( TrigMonitoringEventTPCnv
src/*.cxx
PUBLIC_HEADERS TrigMonitoringEventTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigMonitoringEvent AthenaKernel )
+ LINK_LIBRARIES AthenaPoolCnvSvcLib AthenaPoolUtilities TrigMonitoringEvent
+ PRIVATE_LINK_LIBRARIES AthenaKernel )
atlas_add_dictionary( TrigMonitoringEventTPCnvDict
TrigMonitoringEventTPCnv/TrigMonitoringEventTPCnvDict.h
TrigMonitoringEventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigMonitoringEvent AthenaKernel TrigMonitoringEventTPCnv )
-
-
-atlas_add_test( TrigConfAlgCnv_p1_test
- SOURCES
- test/TrigConfAlgCnv_p1_test.cxx
- LINK_LIBRARIES TrigMonitoringEventTPCnv TestTools )
-
-atlas_add_test( TrigConfChainCnv_p1_test
- SOURCES
- test/TrigConfChainCnv_p1_test.cxx
- LINK_LIBRARIES TrigMonitoringEventTPCnv TestTools )
-
-atlas_add_test( TrigConfSeqCnv_p1_test
- SOURCES
- test/TrigConfSeqCnv_p1_test.cxx
- LINK_LIBRARIES TrigMonitoringEventTPCnv TestTools )
-
-atlas_add_test( TrigConfSigCnv_p1_test
- SOURCES
- test/TrigConfSigCnv_p1_test.cxx
- LINK_LIBRARIES TrigMonitoringEventTPCnv TestTools )
-
-atlas_add_test( TrigMonAlgCnv_p1_test
- SOURCES
- test/TrigMonAlgCnv_p1_test.cxx
- LINK_LIBRARIES TrigMonitoringEventTPCnv TestTools )
-
-atlas_add_test( TrigMonConfigCnv_p1_test
- SOURCES
- test/TrigMonConfigCnv_p1_test.cxx
- LINK_LIBRARIES TrigMonitoringEventTPCnv TestTools )
-
-atlas_add_test( TrigMonEventCnv_p1_test
- SOURCES
- test/TrigMonEventCnv_p1_test.cxx
- LINK_LIBRARIES TrigMonitoringEventTPCnv TestTools )
-
-atlas_add_test( TrigMonROBDataCnv_p1_test
- SOURCES
- test/TrigMonROBDataCnv_p1_test.cxx
- LINK_LIBRARIES TrigMonitoringEventTPCnv TestTools )
-
-atlas_add_test( TrigMonROBDataCnv_p2_test
- SOURCES
- test/TrigMonROBDataCnv_p2_test.cxx
- LINK_LIBRARIES TrigMonitoringEventTPCnv TestTools )
-
-atlas_add_test( TrigMonROBCnv_p1_test
- SOURCES
- test/TrigMonROBCnv_p1_test.cxx
- LINK_LIBRARIES TrigMonitoringEventTPCnv TestTools )
-
-atlas_add_test( TrigMonRoiCnv_p1_test
- SOURCES
- test/TrigMonRoiCnv_p1_test.cxx
- LINK_LIBRARIES TrigMonitoringEventTPCnv TestTools )
-
-atlas_add_test( TrigMonSeqCnv_p1_test
- SOURCES
- test/TrigMonSeqCnv_p1_test.cxx
- LINK_LIBRARIES TrigMonitoringEventTPCnv TestTools )
-
-atlas_add_test( TrigMonTECnv_p1_test
- SOURCES
- test/TrigMonTECnv_p1_test.cxx
- LINK_LIBRARIES TrigMonitoringEventTPCnv TestTools )
+ LINK_LIBRARIES TrigMonitoringEventTPCnv )
+
+# Tests:
+function( _add_test test )
+ atlas_add_test( ${test}
+ SOURCES
+ test/${test}.cxx
+ LINK_LIBRARIES GaudiKernel TestTools TrigMonitoringEventTPCnv )
+endfunction()
+
+_add_test( TrigConfAlgCnv_p1_test )
+_add_test( TrigConfChainCnv_p1_test )
+_add_test( TrigConfSeqCnv_p1_test )
+_add_test( TrigConfSigCnv_p1_test )
+_add_test( TrigMonAlgCnv_p1_test )
+_add_test( TrigMonConfigCnv_p1_test )
+_add_test( TrigMonEventCnv_p1_test )
+_add_test( TrigMonROBDataCnv_p1_test )
+_add_test( TrigMonROBDataCnv_p2_test )
+_add_test( TrigMonROBCnv_p1_test )
+_add_test( TrigMonRoiCnv_p1_test )
+_add_test( TrigMonSeqCnv_p1_test )
+_add_test( TrigMonTECnv_p1_test )
diff --git a/Trigger/TrigEvent/TrigMuonEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigMuonEventTPCnv/CMakeLists.txt
index 771ff0e0142b66998fefc647b2dbce31344284b7..593120d405deec97167e677944e17dad8589b174 100644
--- a/Trigger/TrigEvent/TrigMuonEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigMuonEventTPCnv/CMakeLists.txt
@@ -1,202 +1,56 @@
-################################################################################
-# Package: TrigMuonEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigMuonEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthLinks
- Control/DataModelAthenaPool
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/EventCommonTPCnv
- Event/FourMom
- Reconstruction/Particle
- Trigger/TrigEvent/TrigInDetEventTPCnv
- Trigger/TrigEvent/TrigMuonEvent
- PRIVATE
- AtlasTest/TestTools
- Control/AthenaKernel
- Control/SGTools
- GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_tpcnv_library( TrigMuonEventTPCnv
src/*.cxx
PUBLIC_HEADERS TrigMuonEventTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel )
+ LINK_LIBRARIES AthLinks AthenaPoolCnvSvcLib AthenaPoolUtilities DataModelAthenaPoolLib EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent
+ PRIVATE_LINK_LIBRARIES AthenaKernel )
atlas_add_dictionary( TrigMuonEventTPCnvDict
TrigMuonEventTPCnv/TrigMuonEventTPCnvDict.h
TrigMuonEventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
+ LINK_LIBRARIES TrigMuonEventTPCnv )
atlas_add_dictionary( OLD_TrigMuonEventTPCnvDict
TrigMuonEventTPCnv/TrigMuonEventTPCnvDict.h
TrigMuonEventTPCnv/OLD_selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( CombinedMuonFeatureCnv_p2_test
- SOURCES
- test/CombinedMuonFeatureCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( CombinedMuonFeatureCnv_p3_test
- SOURCES
- test/CombinedMuonFeatureCnv_p3_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( CombinedMuonFeatureCnv_p4_test
- SOURCES
- test/CombinedMuonFeatureCnv_p4_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( IsoMuonFeatureCnv_p3_test
- SOURCES
- test/IsoMuonFeatureCnv_p3_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( MuonFeatureCnv_p1_test
- SOURCES
- test/MuonFeatureCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( MuonFeatureCnv_p2_test
- SOURCES
- test/MuonFeatureCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( MuonFeatureCnv_p3_test
- SOURCES
- test/MuonFeatureCnv_p3_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( MuonFeatureDetailsCnv_p1_test
- SOURCES
- test/MuonFeatureDetailsCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( MuonFeatureDetailsCnv_p2_test
- SOURCES
- test/MuonFeatureDetailsCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TileMuFeatureCnv_p1_test
- SOURCES
- test/TileMuFeatureCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TileMuFeatureCnv_p2_test
- SOURCES
- test/TileMuFeatureCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TileTrackMuFeatureCnv_p2_test
- SOURCES
- test/TileTrackMuFeatureCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TileTrackMuFeatureCnv_p3_test
- SOURCES
- test/TileTrackMuFeatureCnv_p3_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TrigMuonClusterFeatureCnv_p1_test
- SOURCES
- test/TrigMuonClusterFeatureCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TrigMuonEFCbTrackCnv_p5_test
- SOURCES
- test/TrigMuonEFCbTrackCnv_p5_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TrigMuonEFCbTrackCnv_p6_test
- SOURCES
- test/TrigMuonEFCbTrackCnv_p6_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TrigMuonEFCbTrackCnv_p7_test
- SOURCES
- test/TrigMuonEFCbTrackCnv_p7_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TrigMuonEFCnv_p1_test
- SOURCES
- test/TrigMuonEFCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TrigMuonEFCnv_p2_test
- SOURCES
- test/TrigMuonEFCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TrigMuonEFInfoCnv_p4_test
- SOURCES
- test/TrigMuonEFInfoCnv_p4_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TrigMuonEFInfoCnv_p5_test
- SOURCES
- test/TrigMuonEFInfoCnv_p5_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TrigMuonEFInfoTrackCnv_p1_test
- SOURCES
- test/TrigMuonEFInfoTrackCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TrigMuonEFIsolationCnv_p1_test
- SOURCES
- test/TrigMuonEFIsolationCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TrigMuonEFIsolationCnv_p2_test
- SOURCES
- test/TrigMuonEFIsolationCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TrigMuonEFTrackCnv_p5_test
- SOURCES
- test/TrigMuonEFTrackCnv_p5_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
-atlas_add_test( TrigMuonEFTrackCnv_p6_test
- SOURCES
- test/TrigMuonEFTrackCnv_p6_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks DataModelAthenaPoolLib AthenaPoolCnvSvcLib AthenaPoolUtilities EventCommonTPCnv FourMom Particle TrigInDetEventTPCnv TrigMuonEvent TestTools AthenaKernel SGTools GaudiKernel TrigMuonEventTPCnv )
-
+ LINK_LIBRARIES TrigMuonEventTPCnv )
+
+# Tests:
+function( _add_test test )
+ atlas_add_test( ${test}
+ SOURCES
+ test/${test}.cxx
+ LINK_LIBRARIES GaudiKernel TestTools TrigMuonEventTPCnv )
+endfunction()
+
+_add_test( CombinedMuonFeatureCnv_p2_test )
+_add_test( CombinedMuonFeatureCnv_p3_test )
+_add_test( CombinedMuonFeatureCnv_p4_test )
+_add_test( IsoMuonFeatureCnv_p3_test )
+_add_test( MuonFeatureCnv_p1_test )
+_add_test( MuonFeatureCnv_p2_test )
+_add_test( MuonFeatureCnv_p3_test )
+_add_test( MuonFeatureDetailsCnv_p1_test )
+_add_test( MuonFeatureDetailsCnv_p2_test )
+_add_test( TileMuFeatureCnv_p1_test )
+_add_test( TileMuFeatureCnv_p2_test )
+_add_test( TileTrackMuFeatureCnv_p2_test )
+_add_test( TileTrackMuFeatureCnv_p3_test )
+_add_test( TrigMuonClusterFeatureCnv_p1_test )
+_add_test( TrigMuonEFCbTrackCnv_p5_test )
+_add_test( TrigMuonEFCbTrackCnv_p6_test )
+_add_test( TrigMuonEFCbTrackCnv_p7_test )
+_add_test( TrigMuonEFCnv_p1_test )
+_add_test( TrigMuonEFCnv_p2_test )
+_add_test( TrigMuonEFInfoCnv_p4_test )
+_add_test( TrigMuonEFInfoCnv_p5_test )
+_add_test( TrigMuonEFInfoTrackCnv_p1_test )
+_add_test( TrigMuonEFIsolationCnv_p1_test )
+_add_test( TrigMuonEFIsolationCnv_p2_test )
+_add_test( TrigMuonEFTrackCnv_p5_test )
+_add_test( TrigMuonEFTrackCnv_p6_test )
diff --git a/Trigger/TrigEvent/TrigSteeringEvent/CMakeLists.txt b/Trigger/TrigEvent/TrigSteeringEvent/CMakeLists.txt
index a082451a1b6af6b2851f65675b18811cbdca48ad..adfbe9dc9fb3d5c36f5949ab7887101f3ce8a448 100644
--- a/Trigger/TrigEvent/TrigSteeringEvent/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigSteeringEvent/CMakeLists.txt
@@ -1,49 +1,8 @@
-################################################################################
-# Package: TrigSteeringEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigSteeringEvent )
-# Declare the package's dependencies:
-if( XAOD_STANDALONE )
- atlas_depends_on_subdirs(
- PUBLIC
- Control/AthContainers
- Control/AthToolSupport/AsgTools
- Trigger/TrigConfiguration/TrigConfHLTData
- DetectorDescription/RoiDescriptor
- Event/xAOD/xAODCore )
-elseif( XAOD_ANALYSIS )
- atlas_depends_on_subdirs(
- PUBLIC
- Control/AthContainers
- Control/AthToolSupport/AsgTools
- Control/AthenaKernel
- DetectorDescription/RoiDescriptor
- Trigger/TrigConfiguration/TrigConfHLTData
- DetectorDescription/RoiDescriptor
- Event/xAOD/xAODCore )
-else()
- atlas_depends_on_subdirs(
- PUBLIC
- Control/AthContainers
- Control/AthToolSupport/AsgTools
- Control/AthenaKernel
- DetectorDescription/RoiDescriptor
- Event/xAOD/xAODCore
- GaudiKernel
- Trigger/TrigConfiguration/TrigConfHLTData
- PRIVATE
- Event/xAOD/xAODTrigger
- Trigger/TrigDataAccess/TrigSerializeCnvSvc
- Trigger/TrigEvent/TrigNavigation
- Trigger/TrigT1/TrigT1Interfaces )
-
- find_package( tdaq-common )
-endif()
-
-# External dependencies:
# Component(s) in the package:
if( XAOD_STANDALONE )
atlas_add_library( TrigSteeringEvent
@@ -63,12 +22,15 @@ elseif( XAOD_ANALYSIS )
DATA_LINKS TrigRoiDescriptor TrigSuperRoi
LINK_LIBRARIES TrigSteeringEvent )
else()
+ # External dependencies:
+ find_package( Boost )
+ find_package( tdaq-common )
+
atlas_add_library( TrigSteeringEvent
TrigSteeringEvent/*.h Root/*.cxx src/*.cxx
PUBLIC_HEADERS TrigSteeringEvent
- INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthContainers AsgTools AthenaKernel
- RoiDescriptor xAODCore GaudiKernel TrigConfHLTData
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AsgTools AthContainers AthenaBaseComps AthenaKernel GaudiKernel RoiDescriptor TrigConfHLTData xAODCore
PRIVATE_LINK_LIBRARIES TrigT1Interfaces xAODTrigger TrigNavigationLib )
atlas_add_dictionary( TrigSteeringEventDict
diff --git a/Trigger/TrigEvent/TrigSteeringEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigSteeringEventTPCnv/CMakeLists.txt
index f1ca7251000ce15f73307c0bb3016405f4f3becc..eff7eb87b8b31d7f873f6987ea0d2e2baf40dfbd 100644
--- a/Trigger/TrigEvent/TrigSteeringEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigSteeringEventTPCnv/CMakeLists.txt
@@ -1,86 +1,38 @@
-################################################################################
-# Package: TrigSteeringEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigSteeringEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Trigger/TrigEvent/TrigSteeringEvent
- PRIVATE
- AtlasTest/TestTools
- Control/AthenaKernel
- GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_tpcnv_library( TrigSteeringEventTPCnv
src/*.cxx
PUBLIC_HEADERS TrigSteeringEventTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigSteeringEvent TestTools AthenaKernel GaudiKernel )
+ LINK_LIBRARIES AthenaPoolCnvSvcLib AthenaPoolUtilities TrigSteeringEvent
+ PRIVATE_LINK_LIBRARIES AthenaKernel GaudiKernel )
atlas_add_dictionary( TrigSteeringEventTPCnvDict
TrigSteeringEventTPCnv/TrigSteeringEventTPCnvDict.h
TrigSteeringEventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigSteeringEvent TestTools AthenaKernel GaudiKernel TrigSteeringEventTPCnv )
+ LINK_LIBRARIES TrigSteeringEventTPCnv )
atlas_add_dictionary( OLD_TrigSteeringEventTPCnvDict
TrigSteeringEventTPCnv/TrigSteeringEventTPCnvDict.h
TrigSteeringEventTPCnv/OLD_selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigSteeringEvent TestTools AthenaKernel GaudiKernel TrigSteeringEventTPCnv )
-
-atlas_add_test( HLTResultCnv_p1_test
- SOURCES
- test/HLTResultCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigSteeringEvent TestTools AthenaKernel GaudiKernel TrigSteeringEventTPCnv )
-
-atlas_add_test( Lvl1ResultCnv_p2_test
- SOURCES
- test/Lvl1ResultCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigSteeringEvent TestTools AthenaKernel GaudiKernel TrigSteeringEventTPCnv )
-
-atlas_add_test( TrigOperationalInfoCnv_p1_test
- SOURCES
- test/TrigOperationalInfoCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigSteeringEvent TestTools AthenaKernel GaudiKernel TrigSteeringEventTPCnv )
-
-atlas_add_test( TrigPassBitsCnv_p1_test
- SOURCES
- test/TrigPassBitsCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigSteeringEvent TestTools AthenaKernel GaudiKernel TrigSteeringEventTPCnv )
-
-atlas_add_test( TrigPassFlagsCnv_p1_test
- SOURCES
- test/TrigPassFlagsCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigSteeringEvent TestTools AthenaKernel GaudiKernel TrigSteeringEventTPCnv )
-
-atlas_add_test( TrigRoiDescriptorCnv_p1_test
- SOURCES
- test/TrigRoiDescriptorCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigSteeringEvent TestTools AthenaKernel GaudiKernel TrigSteeringEventTPCnv )
-
-atlas_add_test( TrigRoiDescriptorCnv_p2_test
- SOURCES
- test/TrigRoiDescriptorCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigSteeringEvent TestTools AthenaKernel GaudiKernel TrigSteeringEventTPCnv )
-
-atlas_add_test( TrigRoiDescriptorCnv_p3_test
- SOURCES
- test/TrigRoiDescriptorCnv_p3_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrigSteeringEvent TestTools AthenaKernel GaudiKernel TrigSteeringEventTPCnv )
+ LINK_LIBRARIES TrigSteeringEventTPCnv )
+
+# Tests:
+function( _add_test test )
+ atlas_add_test( ${test}
+ SOURCES
+ test/${test}.cxx
+ LINK_LIBRARIES TestTools TrigSteeringEventTPCnv )
+endfunction()
+
+_add_test( HLTResultCnv_p1_test )
+_add_test( Lvl1ResultCnv_p2_test )
+_add_test( TrigOperationalInfoCnv_p1_test )
+_add_test( TrigPassBitsCnv_p1_test )
+_add_test( TrigPassFlagsCnv_p1_test )
+_add_test( TrigRoiDescriptorCnv_p1_test )
+_add_test( TrigRoiDescriptorCnv_p2_test )
+_add_test( TrigRoiDescriptorCnv_p3_test )
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/CMakeLists.txt
index 3caa61737367fec46930d666c67f513e3aca2b60..19b891eaa29baaaf296910b79a9535eada0fc2b9 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/CMakeLists.txt
@@ -24,14 +24,15 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( CLHEP )
+find_package( tdaq-common COMPONENTS eformat )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint )
# Component(s) in the package:
atlas_add_component( TrigLongLivedParticlesHypo
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} TrigCaloEvent TrigInDetEvent TrigMuonEvent TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib CaloEvent CxxUtils xAODJet xAODTracking xAODTrigger GaudiKernel TrigParticle InDetIdentifier InDetPrepRawData IRegionSelector TrkSpacePoint xAODEventInfo)
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} TrigCaloEvent TrigInDetEvent TrigMuonEvent TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib CaloEvent CxxUtils xAODJet xAODTracking xAODTrigger GaudiKernel TrigParticle InDetIdentifier InDetPrepRawData IRegionSelector TrkSpacePoint xAODEventInfo)
# Install files from the package:
atlas_install_headers( TrigLongLivedParticlesHypo )