diff --git a/Trigger/TrigT1/TrigT1CaloCalibTools/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloCalibTools/CMakeLists.txt
index df48e218f2239a000752ba9a32a964f8ac355706..dea05e30876b4d07b4727f0cf3df81f56a26543e 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibTools/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloCalibTools/CMakeLists.txt
@@ -1,62 +1,23 @@
-################################################################################
-# Package: TrigT1CaloCalibTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigT1CaloCalibTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloDetDescr
- Control/AthToolSupport/AsgTools
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- Event/xAOD/xAODTrigL1Calo
- GaudiKernel
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArRecConditions
- LArCalorimeter/LArElecCalib
- PhysicsAnalysis/DerivationFramework/DerivationFrameworkInterfaces
- TileCalorimeter/TileConditions
- TileCalorimeter/TileEvent
- Trigger/TrigT1/TrigT1CaloCalibConditions
- Trigger/TrigT1/TrigT1CaloCalibToolInterfaces
- Trigger/TrigT1/TrigT1CaloCondSvc
- Trigger/TrigT1/TrigT1CaloMonitoringTools
- Trigger/TrigT1/TrigT1CaloToolInterfaces
- Trigger/TrigT1/TrigT1CaloUtils
- PRIVATE
- Calorimeter/CaloEvent
- Calorimeter/CaloIdentifier
- Calorimeter/CaloTriggerTool
- Control/AthenaMonitoring
- Event/EventInfo
- LArCalorimeter/LArRawEvent
- LArCalorimeter/LArCabling
- Tools/LWHists
- Trigger/TrigT1/TrigT1CaloEvent
- Trigger/TrigT1/TrigT1Interfaces )
-
# External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS Graf Gpad Core Tree MathCore Hist RIO pthread Graf3d Html Postscript Gui GX11TTF GX11 )
+find_package( CORAL COMPONENTS CoralBase )
+find_package( ROOT COMPONENTS Graf Gpad Core Hist MathCore Tree )
# Component(s) in the package:
atlas_add_library( TrigT1CaloCalibToolsLib
src/*.cxx
PUBLIC_HEADERS TrigT1CaloCalibTools
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} AsgTools AthenaBaseComps AthenaKernel AthenaPoolUtilities Identifier xAODTrigL1Calo GaudiKernel LArIdentifier LArRecConditions TileEvent TrigT1CaloCalibConditions TrigT1CaloCalibToolInterfaces TrigT1CaloToolInterfaces CaloDetDescrLib StoreGateLib SGtests TileConditionsLib TrigT1CaloMonitoringToolsLib TrigT1CaloUtilsLib CaloTriggerToolLib AthenaMonitoringLib LArCablingLib TrigT1CaloEventLib TrigT1CaloCondSvcLib
- PRIVATE_LINK_LIBRARIES CaloEvent CaloIdentifier EventInfo LArRawEvent LWHists TrigT1Interfaces )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} AsgTools AthenaBaseComps AthenaKernel AthenaPoolUtilities CaloDetDescrLib CaloEvent CaloIdentifier CaloTriggerToolLib DerivationFrameworkInterfaces GaudiKernel Identifier LArCablingLib LArElecCalib LArIdentifier LArRawEvent LArRecConditions StoreGateLib TileConditionsLib TileEvent TrigT1CaloCalibConditions TrigT1CaloCalibToolInterfaces TrigT1CaloCondSvcLib TrigT1CaloEventLib TrigT1CaloMonitoringToolsLib TrigT1CaloToolInterfaces TrigT1CaloUtilsLib TrigT1Interfaces xAODTrigL1Calo
+ PRIVATE_LINK_LIBRARIES AthenaMonitoringLib EventInfo LWHists )
atlas_add_component( TrigT1CaloCalibTools
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CaloDetDescrLib AsgTools AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities Identifier xAODTrigL1Calo GaudiKernel LArIdentifier LArRecConditions TileConditionsLib TileEvent TrigT1CaloCalibConditions TrigT1CaloCalibToolInterfaces TrigT1CaloMonitoringToolsLib TrigT1CaloToolInterfaces TrigT1CaloUtilsLib CaloEvent CaloIdentifier CaloTriggerToolLib AthenaMonitoringLib EventInfo LArRawEvent LArCablingLib LWHists TrigT1CaloEventLib TrigT1Interfaces TrigT1CaloCalibToolsLib )
-
+ LINK_LIBRARIES TrigT1CaloCalibToolsLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/CMakeLists.txt b/Trigger/TrigT1/TrigT1CaloCalibUtils/CMakeLists.txt
index d1cbdc70974ddda4b1e2396140b6f669a70d7540..44651b2ef6596a626ac881719db57ab36f969655 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibUtils/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/CMakeLists.txt
@@ -1,46 +1,13 @@
-################################################################################
-# Package: TrigT1CaloCalibUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigT1CaloCalibUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloIdentifier
- Calorimeter/CaloTriggerTool
- LArCalorimeter/LArElecCalib
- Control/AthenaBaseComps
- Control/AthenaKernel
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/RegistrationServices
- DetectorDescription/Identifier
- Event/EventInfo
- Event/xAOD/xAODTrigL1Calo
- GaudiKernel
- Trigger/TrigConfiguration/TrigConfHLTData
- Trigger/TrigConfiguration/TrigConfL1Data
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigT1/TrigT1CaloCalibConditions
- Trigger/TrigT1/TrigT1CaloCalibToolInterfaces
- Trigger/TrigT1/TrigT1CaloCalibTools
- Trigger/TrigT1/TrigT1CaloCondSvc
- Trigger/TrigT1/TrigT1CaloEvent
- Trigger/TrigT1/TrigT1CaloMonitoringTools
- Trigger/TrigT1/TrigT1CaloUtils
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Control/StoreGate
- Event/xAOD/xAODEventInfo
- Trigger/TrigT1/TrigT1CaloToolInterfaces
- Trigger/TrigT1/TrigT1Interfaces )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost )
find_package( CLHEP )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( CORAL COMPONENTS CoralBase )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO )
# Component(s) in the package:
atlas_add_library( TrigT1CaloCalibUtilsLib
@@ -49,13 +16,12 @@ atlas_add_library( TrigT1CaloCalibUtilsLib
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps AthenaKernel AthenaPoolUtilities Identifier EventInfo xAODTrigL1Calo GaudiKernel TrigConfHLTData TrigConfL1Data TrigSteeringEvent TrigT1CaloCalibConditions TrigT1CaloCalibToolInterfaces CaloTriggerToolLib TrigT1CaloCalibToolsLib TrigT1CaloEventLib TrigT1CaloMonitoringToolsLib TrigT1CaloUtilsLib CaloDetDescrLib StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CaloEvent xAODEventInfo TrigT1CaloToolInterfaces TrigT1Interfaces )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${CORAL_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities CaloIdentifier CaloTriggerToolLib EventInfo GaudiKernel Identifier LArCablingLib LArElecCalib RegistrationServicesLib StoreGateLib TrigConfHLTData TrigConfL1Data TrigT1CaloCalibConditions TrigT1CaloCalibToolInterfaces TrigT1CaloCalibToolsLib TrigT1CaloCondSvcLib TrigT1CaloEventLib TrigT1CaloMonitoringToolsLib TrigT1CaloUtilsLib xAODTrigL1Calo
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CaloDetDescrLib CaloEvent TrigT1CaloToolInterfaces TrigT1Interfaces xAODEventInfo )
atlas_add_component( TrigT1CaloCalibUtils
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} CaloIdentifier CaloTriggerToolLib AthenaBaseComps AthenaKernel AthenaPoolUtilities Identifier EventInfo xAODTrigL1Calo GaudiKernel TrigConfHLTData TrigConfL1Data TrigSteeringEvent TrigT1CaloCalibConditions TrigT1CaloCalibToolInterfaces TrigT1CaloCalibToolsLib TrigT1CaloEventLib TrigT1CaloMonitoringToolsLib TrigT1CaloUtilsLib CaloDetDescrLib CaloEvent StoreGateLib SGtests xAODEventInfo TrigT1CaloToolInterfaces TrigT1Interfaces TrigT1CaloCalibUtilsLib )
+ LINK_LIBRARIES TrigT1CaloCalibUtilsLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )