diff --git a/Trigger/TrigDataAccess/TrigDataAccessMonitoring/CMakeLists.txt b/Trigger/TrigDataAccess/TrigDataAccessMonitoring/CMakeLists.txt
index 422651eec081ef68e9f462b33b5657677f685553..7889473990344a69a20784f7ff502bb42a0335ad 100644
--- a/Trigger/TrigDataAccess/TrigDataAccessMonitoring/CMakeLists.txt
+++ b/Trigger/TrigDataAccess/TrigDataAccessMonitoring/CMakeLists.txt
@@ -1,23 +1,10 @@
-################################################################################
-# Package: TrigDataAccessMonitoring
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigDataAccessMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthContainers
- Event/ByteStreamCnvSvcBase
- Event/ByteStreamData
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/StoreGate )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Hist )
find_package( tdaq-common )
# Component(s) in the package:
@@ -26,21 +13,19 @@ atlas_add_library( TrigDataAccessMonitoringLib
PUBLIC_HEADERS TrigDataAccessMonitoring
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthContainers ByteStreamData GaudiKernel ByteStreamCnvSvcBaseLib ByteStreamData_test StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthContainers AthenaKernel ByteStreamCnvSvcBaseLib ByteStreamData GaudiKernel
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} StoreGateLib )
atlas_add_component( TrigDataAccessMonitoring
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthContainers ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel TestTools StoreGateLib SGtests TrigDataAccessMonitoringLib )
+ LINK_LIBRARIES TrigDataAccessMonitoringLib )
+
+# Install files from the package:
+atlas_install_joboptions( share/*.py )
+# Tests in the package:
atlas_add_test( Methods_test
SOURCES
test/Methods_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthContainers ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel TestTools StoreGateLib SGtests TrigDataAccessMonitoringLib
+ LINK_LIBRARIES TrigDataAccessMonitoringLib
POST_EXEC_SCRIPT nopost.sh )
-
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
-
diff --git a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/CMakeLists.txt b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/CMakeLists.txt
index 395da5c4240d6797ba099f98dfb12bf037349a62..04deb38b4e36a5673096c58bc958563185c55cbb 100644
--- a/Trigger/TrigDataAccess/TrigROBDataProviderSvc/CMakeLists.txt
+++ b/Trigger/TrigDataAccess/TrigROBDataProviderSvc/CMakeLists.txt
@@ -1,25 +1,10 @@
-################################################################################
-# Package: TrigROBDataProviderSvc
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigROBDataProviderSvc )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/ByteStreamData
- GaudiKernel
- Trigger/TrigEvent/TrigSteeringEvent
- PRIVATE
- Control/AthenaMonitoring
- Control/CxxUtils
- Control/StoreGate
- Event/ByteStreamCnvSvcBase
- Trigger/TrigDataAccess/TrigDataAccessMonitoring
- Trigger/TrigMonitoring/TrigMonitorBase )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Hist )
find_package( tdaq-common )
# Component(s) in the package:
@@ -28,13 +13,12 @@ atlas_add_library( TrigROBDataProviderSvcLib
PUBLIC_HEADERS TrigROBDataProviderSvc
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamData GaudiKernel ByteStreamData_test StoreGateLib SGtests ByteStreamCnvSvcBaseLib TrigDataAccessMonitoringLib TrigMonitorBaseLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CxxUtils )
+ LINK_LIBRARIES ByteStreamCnvSvcBaseLib ByteStreamData GaudiKernel TrigDataAccessMonitoringLib TrigSteeringEvent
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaMonitoringKernelLib CxxUtils StoreGateLib )
atlas_add_component( TrigROBDataProviderSvc
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} ByteStreamData ByteStreamData_test GaudiKernel CxxUtils StoreGateLib SGtests ByteStreamCnvSvcBaseLib TrigDataAccessMonitoringLib TrigMonitorBaseLib TrigROBDataProviderSvcLib )
+ LINK_LIBRARIES TrigROBDataProviderSvcLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigDataAccess/TrigSerializeCnvSvc/CMakeLists.txt b/Trigger/TrigDataAccess/TrigSerializeCnvSvc/CMakeLists.txt
index 26d23aee47a7749da09aa4d6f9b8901b2f50af83..0a4e9a6904cb98b548ba0c4325e8c7848da32070 100644
--- a/Trigger/TrigDataAccess/TrigSerializeCnvSvc/CMakeLists.txt
+++ b/Trigger/TrigDataAccess/TrigSerializeCnvSvc/CMakeLists.txt
@@ -1,34 +1,15 @@
-################################################################################
-# Package: TrigSerializeCnvSvc
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigSerializeCnvSvc )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthContainers
- Control/AthenaBaseComps
- Control/StoreGate
- GaudiKernel
- PRIVATE
- Control/CxxUtils
- Control/AthenaKernel
- Control/DataModelRoot
- Database/APR/StorageSvc
- Database/PersistentDataModel
- Trigger/TrigDataAccess/TrigSerializeResult
- Trigger/TrigDataAccess/TrigSerializeTP )
-
-
# Component(s) in the package:
atlas_add_library( TrigSerializeCnvSvcLib
src/*.cxx
PUBLIC_HEADERS TrigSerializeCnvSvc
- LINK_LIBRARIES AthContainers AthenaBaseComps GaudiKernel StoreGateLib SGtests TrigSerializeResultLib TrigSerializeTPLib
- PRIVATE_LINK_LIBRARIES AthenaKernel DataModelRoot StorageSvc PersistentDataModel )
+ LINK_LIBRARIES AthContainers AthenaBaseComps AthenaKernel CxxUtils GaudiKernel StoreGateLib
+ PRIVATE_LINK_LIBRARIES DataModelRoot PersistentDataModel StorageSvc TrigSerializeResultLib TrigSerializeTPLib )
atlas_add_component( TrigSerializeCnvSvc
src/components/*.cxx
- LINK_LIBRARIES AthContainers AthenaBaseComps StoreGateLib SGtests GaudiKernel AthenaKernel DataModelRoot StorageSvc PersistentDataModel TrigSerializeResultLib TrigSerializeTPLib TrigSerializeCnvSvcLib )
-
+ LINK_LIBRARIES TrigSerializeCnvSvcLib )
diff --git a/Trigger/TrigDataAccess/TrigSerializeResult/CMakeLists.txt b/Trigger/TrigDataAccess/TrigSerializeResult/CMakeLists.txt
index abe125667965fd1a0c66db939dc5a0cb232fc261..1cb063e60120692401710d70b2e93c10de0d3a3b 100644
--- a/Trigger/TrigDataAccess/TrigSerializeResult/CMakeLists.txt
+++ b/Trigger/TrigDataAccess/TrigSerializeResult/CMakeLists.txt
@@ -1,51 +1,35 @@
-################################################################################
-# Package: TrigSerializeResult
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigSerializeResult )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/CxxUtils
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/DataModelRoot
- Tools/PathResolver )
-
# External dependencies:
find_package( ROOT COMPONENTS RIO Core Tree MathCore Hist pthread )
+find_package( Boost )
# Component(s) in the package:
atlas_add_library( TrigSerializeResultLib
src/*.cxx
PUBLIC_HEADERS TrigSerializeResult
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaKernel GaudiKernel
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools AthenaBaseComps AthenaKernel DataModelRoot PathResolver )
+ PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel StoreGateLib
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CxxUtils DataModelRoot PathResolver )
atlas_add_component( TrigSerializeResult
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel GaudiKernel TestTools AthenaBaseComps AthenaKernel DataModelRoot PathResolver TrigSerializeResultLib )
+ LINK_LIBRARIES TrigSerializeResultLib )
atlas_add_dictionary( TrigSerializeResultDict
TrigSerializeResult/TrigSerializeResultDict.h
TrigSerializeResult/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel GaudiKernel TestTools AthenaBaseComps AthenaKernel DataModelRoot PathResolver TrigSerializeResultLib )
+ LINK_LIBRARIES TrigSerializeResultLib )
+
+# Install files from the package:
+atlas_install_runtime( share/bs-streamerinfos*.root )
+# Tests in the package:
atlas_add_test( remap_test
SOURCES
test/remap_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel GaudiKernel TestTools AthenaBaseComps AthenaKernel DataModelRoot PathResolver TrigSerializeResultLib
+ LINK_LIBRARIES TrigSerializeResultLib
POST_EXEC_SCRIPT nopost.sh )
-
-# Install files from the package:
-atlas_install_runtime( share/bs-streamerinfos*.root )
-
diff --git a/Trigger/TrigDataAccess/TrigSerializeTP/CMakeLists.txt b/Trigger/TrigDataAccess/TrigSerializeTP/CMakeLists.txt
index c77b2e1f2fedaffe406f1a7a448ab2193235cbc0..22f0ee0933717ceb075bfac166b22b9dc388bed2 100644
--- a/Trigger/TrigDataAccess/TrigSerializeTP/CMakeLists.txt
+++ b/Trigger/TrigDataAccess/TrigSerializeTP/CMakeLists.txt
@@ -1,18 +1,10 @@
-################################################################################
-# Package: TrigSerializeTP
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigSerializeTP )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- GaudiKernel )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core )
# Component(s) in the package:
atlas_add_library( TrigSerializeTPLib
@@ -24,6 +16,4 @@ atlas_add_library( TrigSerializeTPLib
atlas_add_component( TrigSerializeTP
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TrigSerializeTPLib )
-
+ LINK_LIBRARIES TrigSerializeTPLib )