diff --git a/Trigger/TrigMonitoring/TrigCostMonitorMT/CMakeLists.txt b/Trigger/TrigMonitoring/TrigCostMonitorMT/CMakeLists.txt
index 0baf431770664fb8f7713e14dd9736f232b04937..2ed82d64fb0eb3634ff0f2861fcf672deaa14e29 100644
--- a/Trigger/TrigMonitoring/TrigCostMonitorMT/CMakeLists.txt
+++ b/Trigger/TrigMonitoring/TrigCostMonitorMT/CMakeLists.txt
@@ -7,25 +7,19 @@ atlas_subdir( TrigCostMonitorMT )
find_package(TBB)
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthViews
- Trigger/TrigTools/TrigTimeAlgs
- Trigger/TrigConfiguration/TrigConfHLTData
- Trigger/TrigEvent/TrigSteeringEvent
- Event/xAOD/xAODTrigger )
-
# Component(s) in the package:
+atlas_add_library( TrigCostMonitorMTLib
+ TrigCostMonitorMT/*.h
+ INTERFACE
+ PUBLIC_HEADERS TrigCostMonitorMT
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel StoreGateLib xAODTrigger )
+
atlas_add_component( TrigCostMonitorMT
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES GaudiKernel AthenaBaseComps AthViews TrigSteeringEvent TrigTimeAlgsLib xAODTrigger TrigConfHLTData ${TBB_LIBRARIES} )
+ LINK_LIBRARIES ${TBB_LIBRARIES} AthContainers AthViews AthenaKernel TrigConfHLTData TrigCostMonitorMTLib TrigSteeringEvent TrigTimeAlgsLib )
# Install files from the package:
-atlas_install_headers( TrigCostMonitorMT )
-atlas_install_python_modules( python/*.py)
- atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt b/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt
index bfcae8d8e48cb789999dd23fa49e2ed58797b1e8..568ab360049d71af54926c91dcaffb1039e217d3 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt
+++ b/Trigger/TrigSteer/TrigOutputHandling/CMakeLists.txt
@@ -5,40 +5,6 @@
# Declare the package name:
atlas_subdir( TrigOutputHandling )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthContainers
- Control/AthLinks
- Control/AthenaBaseComps
- Control/AthViews
- Control/RootUtils
- Trigger/TrigEvent/TrigSteeringEvent
- Event/xAOD/xAODTrigCalo
- Event/xAOD/xAODTrigRinger
- Event/xAOD/xAODTrigEgamma
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODTrigger
- Event/xAOD/xAODTracking
- Trigger/TrigDataAccess/TrigSerializeResult
- Event/xAOD/xAODTrigMuon
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTrigMissingET
- Event/xAOD/xAODTau
- Event/xAOD/xAODTrigBphys
- Event/xAOD/xAODJet
- Event/xAOD/xAODBTagging
- Trigger/TrigSteer/DecisionHandling
- Trigger/TrigSteer/TrigCompositeUtils
- Control/AthenaMonitoringKernel
- Trigger/TrigMonitoring/TrigCostMonitorMT
- Trigger/TrigAlgorithms/TrigPartialEventBuilding
- Trigger/TrigDataAccess/TrigSerializeTP
- Trigger/TrigConfiguration/TrigConfData
- Control/AthContainersRoot)
-
-
find_package( tdaq-common COMPONENTS eformat )
find_package( Boost )
@@ -47,34 +13,28 @@ atlas_add_library( TrigOutputHandlingLib
src/*.cxx
PUBLIC_HEADERS TrigOutputHandling
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} GaudiKernel AthViews AthenaBaseComps RootUtils TrigSteeringEvent TrigSerializeResultLib TrigConfData
- xAODTrigCalo xAODTrigRinger xAODTrigEgamma xAODEgamma xAODBTagging xAODTrigger xAODTracking xAODTrigMuon xAODMuon xAODTau xAODTrigBphys xAODTrigMissingET DecisionHandlingLib AthenaMonitoringKernelLib TrigPartialEventBuildingLib TrigSerializeTPLib AthContainersRoot TrigCompositeUtilsLib )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} GaudiKernel AthViews AthenaBaseComps RootUtils TrigSteeringEvent TrigSerializeResultLib TrigConfData xAODTrigCalo xAODTrigRinger xAODTrigEgamma xAODEgamma xAODBTagging xAODTrigger xAODTracking xAODTrigMuon xAODMuon xAODTau xAODTrigBphys xAODTrigMissingET DecisionHandlingLib AthenaMonitoringKernelLib TrigPartialEventBuildingLib TrigSerializeTPLib AthContainersRoot TrigCompositeUtilsLib TrigCostMonitorMTLib )
atlas_add_component( TrigOutputHandling
src/components/*.cxx
LINK_LIBRARIES TrigOutputHandlingLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py )
# Tests:
atlas_add_test( void_record_test
SOURCES test/void_record_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} xAODTrigger
- AthLinks AthenaKernel StoreGateLib GaudiKernel TestTools xAODCore
+ LINK_LIBRARIES TrigOutputHandlingLib
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share"
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 300
)
-
atlas_add_test( serial_deserial_test
SOURCES test/serial_deserial_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} xAODTrigEgamma xAODEgamma TrigSteeringEvent
- AthLinks AthenaKernel StoreGateLib GaudiKernel TestTools xAODCore TrigOutputHandlingLib TrigCompositeUtilsLib
+ LINK_LIBRARIES TrigOutputHandlingLib
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share"
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 300
@@ -82,9 +42,7 @@ atlas_add_test( serial_deserial_test
atlas_add_test( schema_evolution_test
SOURCES test/schema_evolution_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} xAODTrigEgamma xAODEgamma
- AthLinks AthenaKernel StoreGateLib GaudiKernel TestTools xAODCore TrigOutputHandlingLib TrigCompositeUtilsLib
+ LINK_LIBRARIES TrigOutputHandlingLib
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share"
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 300