diff --git a/Calorimeter/CaloBadChannelTool/CMakeLists.txt b/Calorimeter/CaloBadChannelTool/CMakeLists.txt
index c39f645f516c8da248454da5c954207ce7c06ebb..3e3f350e1a0e6ecfe74c6f4f7d84b97d2f9a679f 100644
--- a/Calorimeter/CaloBadChannelTool/CMakeLists.txt
+++ b/Calorimeter/CaloBadChannelTool/CMakeLists.txt
@@ -1,28 +1,15 @@
-################################################################################
-# Package: CaloBadChannelTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloBadChannelTool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloConditions
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- LArCalorimeter/LArRecConditions
- GaudiKernel
- PRIVATE
- Control/StoreGate )
-
# Component(s) in the package:
atlas_add_component( CaloBadChannelTool
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES CaloConditions LArRecConditions CaloIdentifier AthenaBaseComps GaudiKernel StoreGateLib SGtests )
+ LINK_LIBRARIES CaloConditions LArRecConditions CaloIdentifier AthenaBaseComps GaudiKernel StoreGateLib )
# Install files from the package:
-atlas_install_headers( CaloBadChannelTool )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Tests:
diff --git a/Calorimeter/CaloCalibHitRec/CMakeLists.txt b/Calorimeter/CaloCalibHitRec/CMakeLists.txt
index 3342db7af7594ef1b7aa2f8540c08858285f597f..2b0ab6d53ff4cfd35fb082cba86673267672a0ce 100644
--- a/Calorimeter/CaloCalibHitRec/CMakeLists.txt
+++ b/Calorimeter/CaloCalibHitRec/CMakeLists.txt
@@ -1,50 +1,23 @@
-################################################################################
-# Package: CaloCalibHitRec
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloCalibHitRec )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloDmDetDescr
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Calorimeter/CaloRec
- Calorimeter/CaloSimEvent
- Control/AthenaBaseComps
- Control/StoreGate
- DetectorDescription/Identifier
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODTruth
- Control/CxxUtils
- GaudiKernel
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Control/AthenaKernel
- DetectorDescription/AtlasDetDescr
- LArCalorimeter/LArRecEvent
- PhysicsAnalysis/TruthParticleID/McParticleEvent
- TileCalorimeter/TileEvent
- Tools/PathResolver )
-
# External dependencies:
find_package( CLHEP )
# Component(s) in the package:
atlas_add_library( CaloCalibHitRecLib
- src/*.cxx
- PUBLIC_HEADERS CaloCalibHitRec
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloDmDetDescr CaloGeoHelpers CaloIdentifier CaloRecLib CaloSimEvent AthenaBaseComps StoreGateLib SGtests Identifier xAODCaloEvent xAODTruth GaudiKernel CaloDetDescrLib CaloEvent AthenaKernel AtlasDetDescr LArRecEvent McParticleEvent TileEvent PathResolver CxxUtils )
+ src/*.cxx
+ PUBLIC_HEADERS CaloCalibHitRec
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel CaloDmDetDescr CaloGeoHelpers CaloIdentifier CaloRecLib CaloSimEvent CxxUtils GaudiKernel Identifier StoreGateLib xAODCaloEvent xAODTruth
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} AtlasDetDescr CaloDetDescrLib CaloEvent CaloUtilsLib LArRecEvent McParticleEvent PathResolver TileEvent )
# Component(s) in the package:
atlas_add_component( CaloCalibHitRec
- src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloDmDetDescr CaloGeoHelpers CaloIdentifier CaloRecLib CaloSimEvent AthenaBaseComps StoreGateLib SGtests Identifier xAODCaloEvent xAODTruth GaudiKernel CaloDetDescrLib CaloEvent AthenaKernel AtlasDetDescr LArRecEvent McParticleEvent TileEvent PathResolver CxxUtils )
+ LINK_LIBRARIES CaloCalibHitRecLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Calorimeter/CaloCellCorrection/CMakeLists.txt b/Calorimeter/CaloCellCorrection/CMakeLists.txt
index dc5e7573e31a2b4361bbaf44c5b7943915a2b0a9..c809277d207f5921914e196402b822651a2758d6 100644
--- a/Calorimeter/CaloCellCorrection/CMakeLists.txt
+++ b/Calorimeter/CaloCellCorrection/CMakeLists.txt
@@ -1,26 +1,8 @@
-################################################################################
-# Package: CaloCellCorrection
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloCellCorrection )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloCondBlobObjs
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Calorimeter/CaloUtils
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- GaudiKernel
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- DetectorDescription/Identifier )
-
# External dependencies:
find_package( CLHEP )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
@@ -30,7 +12,7 @@ atlas_add_component( CaloCellCorrection
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} CaloCondBlobObjs CaloIdentifier CaloUtilsLib AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities GaudiKernel CaloDetDescrLib CaloEvent Identifier )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities CaloCondBlobObjs CaloConditions CaloDetDescrLib CaloEvent CaloIdentifier CaloInterfaceLib CaloUtilsLib GaudiKernel Identifier StoreGateLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Calorimeter/CaloClusterCorrection/CMakeLists.txt b/Calorimeter/CaloClusterCorrection/CMakeLists.txt
index 0503a4e6690d5a2a651e4f8979f3586838b790c3..c25ec3234ed0c210110e573d5d757c5802a77c67 100644
--- a/Calorimeter/CaloClusterCorrection/CMakeLists.txt
+++ b/Calorimeter/CaloClusterCorrection/CMakeLists.txt
@@ -1,40 +1,10 @@
-################################################################################
-# Package: CaloClusterCorrection
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloClusterCorrection )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloConditions
- TileCalorimeter/TileConditions
- LArCalorimeter/LArRecConditions
- Calorimeter/CaloEvent
- Calorimeter/CaloInterface
- Calorimeter/CaloRec
- Control/AthenaKernel
- Control/CxxUtils
- Control/StoreGate
- Event/xAOD/xAODCaloEvent
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/AthenaBaseComps
- Database/AthenaPOOL/AthenaPoolUtilities
- Calorimeter/CaloDetDescr
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloUtils
- Calorimeter/CaloCondBlobObjs
- Calorimeter/CaloIdentifier
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArCabling
- Control/AthContainers
- DetectorDescription/Identifier
- Event/EventKernel
- Tools/PathResolver )
-
# External dependencies:
+find_package( Boost )
find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -44,19 +14,19 @@ atlas_add_library( CaloClusterCorrectionLib
PUBLIC_HEADERS CaloClusterCorrection
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES CaloCondBlobObjs CaloConditions CaloEvent CaloIdentifier AthenaBaseComps AthenaKernel CxxUtils AthenaPoolUtilities xAODCaloEvent GaudiKernel LArIdentifier LArRecConditions TileConditionsLib CaloRecLib StoreGateLib SGtests LArToolsLib CaloDetDescrLib CaloUtilsLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} TestTools CaloGeoHelpers Identifier EventKernel PathResolver )
+ LINK_LIBRARIES AthenaKernel CaloConditions CaloEvent CaloInterfaceLib CaloRecLib CaloUtilsLib CxxUtils GaudiKernel StoreGateLib TileConditionsLib xAODCaloEvent
+ PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthenaBaseComps CaloDetDescrLib CaloGeoHelpers CaloIdentifier LArRecConditions PathResolver )
atlas_add_component( CaloClusterCorrection
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES CaloClusterCorrectionLib )
+# Test(s) in the package:
atlas_add_test( interpolate_test
SOURCES
test/interpolate_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloCondBlobObjs CaloConditions CaloEvent CaloIdentifier CaloRecLib AthenaBaseComps AthenaKernel CxxUtils StoreGateLib SGtests AthenaPoolUtilities xAODCaloEvent GaudiKernel LArIdentifier LArToolsLib TestTools CaloDetDescrLib CaloGeoHelpers CaloUtilsLib Identifier EventKernel PathResolver CaloClusterCorrectionLib )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} CaloClusterCorrectionLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt b/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt
index 9998079e5a23adfe63f21c9e25c4bdf5a6f27c9e..b95ae7934287f63f851c203071163f50949ce47a 100644
--- a/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt
@@ -1,26 +1,14 @@
-################################################################################
-# Package: CaloCondAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloCondAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- PRIVATE
- Calorimeter/CaloConditions
- Calorimeter/CaloTriggerTool
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolCnvSvc )
-
# Component(s) in the package:
atlas_add_poolcnv_library( CaloCondAthenaPoolPoolCnv
src/*.cxx
FILES CaloTriggerTool/LArTTCellMap.h CaloTriggerTool/CaloTTOnOffIdMap.h CaloTriggerTool/CaloTTOnAttrIdMap.h CaloTriggerTool/CaloTTPpmRxIdMap.h CaloConditions/ToolConstants.h CaloConditions/CaloCellFactor.h CaloConditions/CaloCellPositionShift.h CaloConditions/CaloHadWeight.h CaloConditions/CaloEMFrac.h CaloConditions/CaloHadDMCoeff.h CaloConditions/CaloHadDMCoeff2.h CaloConditions/CaloLocalHadCoeff.h
TYPES_WITH_NAMESPACE CaloRec::ToolConstants CaloRec::CaloCellFactor CaloRec::CaloCellPositionShift
- LINK_LIBRARIES AthenaPoolUtilities CaloConditions CaloTriggerToolLib AthenaKernel StoreGateLib SGtests AthenaPoolCnvSvcLib )
+ LINK_LIBRARIES CaloConditions CaloTriggerToolLib AthenaKernel GaudiKernel AthenaPoolCnvSvcLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
index 6fa74fd3844b2ed02ab00c70d874d6c3233666e9..7e37acc4f0d88306b7bcaf449b2ade289dae0dc5 100644
--- a/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
@@ -1,27 +1,12 @@
-################################################################################
-# Package: CaloIdCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloIdCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloIdentifier
- Control/AthenaKernel
- DetectorDescription/DetDescrCnvSvc
- PRIVATE
- Control/StoreGate
- DetectorDescription/IdDictDetDescr
- DetectorDescription/Identifier
- GaudiKernel )
-
# Component(s) in the package:
atlas_add_component( CaloIdCnv
src/*.cxx
- LINK_LIBRARIES CaloIdentifier AthenaKernel DetDescrCnvSvcLib StoreGateLib SGtests IdDictDetDescr Identifier GaudiKernel )
+ LINK_LIBRARIES CaloIdentifier AthenaKernel DetDescrCnvSvcLib StoreGateLib IdDictDetDescr Identifier GaudiKernel )
# Install files from the package:
-atlas_install_headers( CaloIdCnv )
atlas_install_joboptions( share/*.py )
-
diff --git a/Calorimeter/CaloCnv/CaloJiveXML/CMakeLists.txt b/Calorimeter/CaloCnv/CaloJiveXML/CMakeLists.txt
index 9d62b72a25c3773152c4e768fb5505a0145c74eb..9c75e75f6953c609149a3f3d8ecdd6d3f2722862 100644
--- a/Calorimeter/CaloCnv/CaloJiveXML/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloJiveXML/CMakeLists.txt
@@ -1,31 +1,8 @@
-################################################################################
-# Package: CaloJiveXML
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloJiveXML )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- GaudiKernel
- LArCalorimeter/LArCabling
- TileCalorimeter/TileConditions
- TileCalorimeter/TileEvent
- graphics/JiveXML
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Control/AthenaKernel
- DetectorDescription/Identifier
- Event/EventContainers
- LArCalorimeter/LArElecCalib
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArRawEvent
- TileCalorimeter/TileCalib/TileCalibBlobObjs
- TileCalorimeter/TileIdentifier )
-
# External dependencies:
find_package( CLHEP )
@@ -34,9 +11,7 @@ atlas_add_component( CaloJiveXML
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps GaudiKernel LArToolsLib TileConditionsLib TileEvent JiveXMLLib CaloDetDescrLib CaloEvent AthenaKernel Identifier LArIdentifier LArRawEvent TileCalibBlobObjs TileIdentifier )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel CaloDetDescrLib CaloEvent CaloIdentifier EventContainers GaudiKernel Identifier JiveXMLLib LArCablingLib LArElecCalib LArIdentifier LArRawEvent TileCalibBlobObjs TileConditionsLib TileEvent TileIdentifier )
# Install files from the package:
-atlas_install_headers( CaloJiveXML )
atlas_install_joboptions( share/*.py )
-
diff --git a/Calorimeter/CaloCnv/CaloSimEventAthenaPool/CMakeLists.txt b/Calorimeter/CaloCnv/CaloSimEventAthenaPool/CMakeLists.txt
index d0060d22782d2b2f4e60e53f342e55ae506be186..6266d001a50ec47ad0f23700acd2aa510432e0f0 100644
--- a/Calorimeter/CaloCnv/CaloSimEventAthenaPool/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloSimEventAthenaPool/CMakeLists.txt
@@ -1,20 +1,10 @@
-################################################################################
-# Package: CaloSimEventAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloSimEventAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- PRIVATE
- Calorimeter/CaloCnv/CaloSimEventTPCnv
- Calorimeter/CaloSimEvent
- Database/AthenaPOOL/AthenaPoolCnvSvc )
-
# Component(s) in the package:
atlas_add_poolcnv_library( CaloSimEventAthenaPoolPoolCnv
src/*.cxx
FILES CaloSimEvent/CaloCalibrationHitContainer.h
- LINK_LIBRARIES AthenaPoolUtilities CaloSimEventTPCnv CaloSimEvent AthenaPoolCnvSvcLib )
+ LINK_LIBRARIES CaloSimEventTPCnv CaloSimEvent AthenaPoolCnvSvcLib GaudiKernel )
diff --git a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CMakeLists.txt
index c80dbcb477bc305c866079de4da99b430dbc65a1..212f2f9fecd6d0e1e95e4d25978a6d3e0cf9574e 100644
--- a/Calorimeter/CaloCnv/CaloSimEventTPCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloSimEventTPCnv/CMakeLists.txt
@@ -1,73 +1,49 @@
-################################################################################
-# Package: CaloSimEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloSimEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloSimEvent
- Database/AthenaPOOL/AthenaPoolCnvSvc
- DetectorDescription/Identifier
- PRIVATE
- AtlasTest/TestTools
- Calorimeter/CaloIdentifier
- Control/AthenaKernel
- GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_tpcnv_library( CaloSimEventTPCnv
src/*.cxx
PUBLIC_HEADERS CaloSimEventTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel )
+ LINK_LIBRARIES CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel )
atlas_add_dictionary( CaloSimEventTPCnvDict
CaloSimEventTPCnv/CaloSimEventTPCnvDict.h
CaloSimEventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv )
+ LINK_LIBRARIES CaloSimEventTPCnv )
atlas_add_dictionary( OLD_CaloSimEventTPCnvDict
CaloSimEventTPCnv/CaloSimEventTPCnvDict.h
CaloSimEventTPCnv/OLD_selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv )
+ LINK_LIBRARIES CaloSimEventTPCnv )
atlas_add_test( CaloCalibrationHitCnv_p1_test
SOURCES
test/CaloCalibrationHitCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv )
+ LINK_LIBRARIES CaloSimEventTPCnv )
atlas_add_test( CaloCalibrationHitCnv_p2_test
SOURCES
test/CaloCalibrationHitCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv )
+ LINK_LIBRARIES CaloSimEventTPCnv )
atlas_add_test( CaloCalibrationHitContainerCnv_p1_test
SOURCES
test/CaloCalibrationHitContainerCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv
+ LINK_LIBRARIES CaloSimEventTPCnv
LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
atlas_add_test( CaloCalibrationHitContainerCnv_p2_test
SOURCES
test/CaloCalibrationHitContainerCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv
+ LINK_LIBRARIES CaloSimEventTPCnv
LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
atlas_add_test( CaloCalibrationHitContainerCnv_p3_test
SOURCES
test/CaloCalibrationHitContainerCnv_p3_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloSimEvent AthenaPoolCnvSvcLib Identifier TestTools CaloIdentifier AthenaKernel GaudiKernel CaloSimEventTPCnv
+ LINK_LIBRARIES CaloSimEventTPCnv
LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
diff --git a/Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt
index 36e1c9be4c97f13b067e4f2dac2d6cc7775f9e6c..a67dbc1210aa60e6eceb6eab08fb75fdcd6489c1 100644
--- a/Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloTPCnv/CMakeLists.txt
@@ -1,79 +1,44 @@
-################################################################################
-# Package: CaloTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloEvent
- Control/AthenaKernel
- Control/AthAllocators
- Control/AthLinks
- Control/DataModelAthenaPool
- Control/Navigation
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Event/EventCommonTPCnv
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Calorimeter/CaloConditions
- Calorimeter/CaloGeoHelpers
- #Calorimeter/CaloInterface
- Calorimeter/CaloUtils
- Control/CxxUtils
- Control/SGTools
- Event/EventKernel
- LArCalorimeter/LArRecEvent
- TileCalorimeter/TileEvent
- DetectorDescription/IdDictParser
- )
-
# External dependencies:
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_tpcnv_library( CaloTPCnv
src/*.cxx
PUBLIC_HEADERS CaloTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel LArRecEvent TileEvent )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel LArRecEvent TileEvent )
atlas_add_dictionary( CaloTPCnvDict
CaloTPCnv/CaloTPCnvDict.h
CaloTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel CaloTPCnv LArRecEvent TileEvent)
+ LINK_LIBRARIES CaloTPCnv )
atlas_add_dictionary( OLD_CaloTPCnvDict
CaloTPCnv/CaloTPCnvDict.h
CaloTPCnv/OLD_selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel CaloTPCnv LArRecEvent TileEvent)
+ LINK_LIBRARIES CaloTPCnv )
atlas_add_test( CaloCellLinkContainerCnv_p2_test
SOURCES
test/CaloCellLinkContainerCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel CaloTPCnv
+ LINK_LIBRARIES CaloTPCnv
LOG_IGNORE_PATTERN "Athena::getMessageSvc" )
atlas_add_test( CaloClusterContainerCnv_test
SOURCES
test/CaloClusterContainerCnv_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel CaloTPCnv )
-
+ LINK_LIBRARIES CaloTPCnv )
atlas_add_test( CaloClusterCellLinkContainerCnv_p1_test
SOURCES
test/CaloClusterCellLinkContainerCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaKernel AthAllocators AthLinks DataModelAthenaPoolLib Navigation AthenaPoolCnvSvcLib EventCommonTPCnv GaudiKernel TestTools CaloConditions CaloGeoHelpers CaloUtilsLib SGTools EventKernel CaloTPCnv )
-
+ LINK_LIBRARIES CaloTPCnv )
atlas_add_test( CaloCellPackerUtils_test
SOURCES test/CaloCellPackerUtils_test.cxx
diff --git a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
index 307036458fb809c33561e357681b0727250e5505..3de2fffe7d33c637c8f687fc49aefee113d45b67 100644
--- a/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloTTDetDescrCnv/CMakeLists.txt
@@ -1,24 +1,9 @@
-################################################################################
-# Package: CaloTTDetDescrCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTTDetDescrCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloIdentifier
- Calorimeter/CaloTTDetDescr
- Calorimeter/CaloTriggerTool
- Control/StoreGate
- DetectorDescription/DetDescrCnvSvc
- LArCalorimeter/LArCabling )
-
# Component(s) in the package:
atlas_add_component( CaloTTDetDescrCnv
src/*.cxx
- LINK_LIBRARIES GaudiKernel CaloDetDescrLib CaloIdentifier CaloTTDetDescr CaloTriggerToolLib StoreGateLib SGtests DetDescrCnvSvcLib LArCablingLib )
-
+ LINK_LIBRARIES GaudiKernel CaloDetDescrLib CaloIdentifier CaloTTDetDescr CaloTriggerToolLib StoreGateLib DetDescrCnvSvcLib )
diff --git a/Calorimeter/CaloCondBlobAlgs/CMakeLists.txt b/Calorimeter/CaloCondBlobAlgs/CMakeLists.txt
index 50707e0da7fc38e100df5d6a8f44fe383d500797..572963c1df70cee602533bd8415c5466d0ea8b63 100644
--- a/Calorimeter/CaloCondBlobAlgs/CMakeLists.txt
+++ b/Calorimeter/CaloCondBlobAlgs/CMakeLists.txt
@@ -1,23 +1,8 @@
-################################################################################
-# Package: CaloCondBlobAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloCondBlobAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloCondBlobObjs
- Calorimeter/CaloDetDescr
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- Event/xAOD/xAODEventInfo
- GaudiKernel )
-
# External dependencies:
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
@@ -26,9 +11,8 @@ atlas_add_component( CaloCondBlobAlgs
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} CaloCondBlobObjs CaloDetDescrLib CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities Identifier xAODEventInfo GaudiKernel )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} CaloCondBlobObjs CaloDetDescrLib CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib AthenaPoolUtilities Identifier xAODEventInfo GaudiKernel )
# Install files from the package:
-atlas_install_headers( CaloCondBlobAlgs )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
diff --git a/Calorimeter/CaloCondBlobObjs/CMakeLists.txt b/Calorimeter/CaloCondBlobObjs/CMakeLists.txt
index 0e9c07db0f1f9151fa0414d1f9ddb8a6567d80dc..19a1ac916d004e4e9c7c9c38fc91723f9f567c42 100644
--- a/Calorimeter/CaloCondBlobObjs/CMakeLists.txt
+++ b/Calorimeter/CaloCondBlobObjs/CMakeLists.txt
@@ -1,38 +1,24 @@
-################################################################################
-# Package: CaloCondBlobObjs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloCondBlobObjs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- PRIVATE
- Control/AthenaKernel
- AtlasTest/TestTools )
-
# External dependencies:
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( CORAL COMPONENTS CoralBase )
find_package( Boost COMPONENTS unit_test_framework )
-# tag NEEDS_CORAL_BASE was not recognized in automatic conversion in cmt2cmake
-
# Component(s) in the package:
atlas_add_library( CaloCondBlobObjs
src/*.cxx
PUBLIC_HEADERS CaloCondBlobObjs
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${CORAL_LIBRARIES} GaudiKernel
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel )
+ PRIVATE_LINK_LIBRARIES AthenaKernel )
atlas_add_dictionary( CaloCondBlobObjsDict
CaloCondBlobObjs/CaloCondBlobObjsDict.h
CaloCondBlobObjs/selection.xml
- INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} GaudiKernel AthenaKernel CaloCondBlobObjs )
+ LINK_LIBRARIES CaloCondBlobObjs )
atlas_add_test( CaloCondBlobBase_test
SOURCES
diff --git a/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt b/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt
index 2a7b7ca629b8d9ff8c323cfabe04bd4eed4cad7d..07375e965d69b678018d9894da2768db41a07a5a 100644
--- a/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt
+++ b/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt
@@ -1,45 +1,13 @@
-################################################################################
-# Package: CaloCondPhysAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloCondPhysAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloCondBlobObjs
- Calorimeter/CaloDetDescr
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- GaudiKernel
- LArCalorimeter/LArCabling
- LArCalorimeter/LArElecCalib
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArRecUtils
- LArCalorimeter/LArTools
- LArCalorimeter/LArRawConditions
- Trigger/TrigAnalysis/TrigDecisionTool
- PRIVATE
- Calorimeter/CaloConditions
- Calorimeter/CaloEvent
- Calorimeter/CaloUtils
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- Event/xAOD/xAODEventInfo
- LArCalorimeter/LArGeoModel/LArHV
- LArCalorimeter/LArGeoModel/LArReadoutGeometry
- LArCalorimeter/LArSimEvent
- Control/CxxUtils)
-
# External dependencies:
find_package( CLHEP )
find_package( COOL COMPONENTS CoolKernel )
-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 )
# Component(s) in the package:
atlas_add_component( CaloCondPhysAlgs
@@ -47,8 +15,8 @@ atlas_add_component( CaloCondPhysAlgs
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} ${COOL_LIBRARIES} ${CLHEP_LIBRARIES} CaloCondBlobObjs CaloDetDescrLib CaloGeoHelpers
- CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests GaudiKernel LArCablingLib LArIdentifier TrigDecisionToolLib LArRawConditions
- CaloConditions CaloEvent CaloUtilsLib AthenaPoolUtilities Identifier xAODEventInfo LArHV LArReadoutGeometry LArSimEvent CxxUtils)
+ CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib GaudiKernel LArCablingLib LArElecCalib LArIdentifier TrigDecisionToolLib LArRawConditions
+ CaloConditions CaloEvent CaloInterfaceLib CaloUtilsLib AthenaPoolUtilities Identifier xAODEventInfo LArHV LArReadoutGeometry LArSimEvent CxxUtils)
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Calorimeter/CaloConditions/CMakeLists.txt b/Calorimeter/CaloConditions/CMakeLists.txt
index 2f59bd843129689d30eea7c0ed3893189fd87689..660f86bec23a0474f3034dff1c0550cbd49e446f 100644
--- a/Calorimeter/CaloConditions/CMakeLists.txt
+++ b/Calorimeter/CaloConditions/CMakeLists.txt
@@ -1,21 +1,8 @@
-################################################################################
-# Package: CaloConditions
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloConditions )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/CxxUtils
- Control/AthenaKernel
- DetectorDescription/Identifier
- Calorimeter/CaloCondBlobObjs
- Calorimeter/CaloIdentifier
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system timer )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -25,22 +12,19 @@ atlas_add_library( CaloConditions
src/*.cxx
PUBLIC_HEADERS CaloConditions
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES CxxUtils Identifier CaloIdentifier CaloCondBlobObjs AthenaKernel GaudiKernel
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} TestTools )
+ LINK_LIBRARIES ${Boost_LIBRARIES} CxxUtils Identifier CaloIdentifier CaloCondBlobObjs AthenaKernel GaudiKernel
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
atlas_add_dictionary( CaloConditionsDict
CaloConditions/CaloConditionsDict.h
CaloConditions/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CxxUtils Identifier GaudiKernel TestTools CaloConditions )
+ LINK_LIBRARIES CaloConditions )
atlas_add_test( ToolConstants_test
SOURCES
test/ToolConstants_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CxxUtils Identifier GaudiKernel TestTools CaloConditions )
+ LINK_LIBRARIES CaloConditions )
# Install files from the package:
atlas_install_joboptions( share/*.py )
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Calorimeter/CaloDmDetDescr/CMakeLists.txt b/Calorimeter/CaloDmDetDescr/CMakeLists.txt
index a8030ad3bf598b9d0deb70213301b4c79a168ae9..be2ccb33fab360383530bacc589da1f16db5438e 100644
--- a/Calorimeter/CaloDmDetDescr/CMakeLists.txt
+++ b/Calorimeter/CaloDmDetDescr/CMakeLists.txt
@@ -1,24 +1,13 @@
-################################################################################
-# Package: CaloDmDetDescr
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloDmDetDescr )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloIdentifier
- Control/StoreGate
- PRIVATE
- Control/AthenaKernel
- GaudiKernel
- Tools/PathResolver )
-
# Component(s) in the package:
atlas_add_library( CaloDmDetDescr
src/*.cxx
PUBLIC_HEADERS CaloDmDetDescr
- LINK_LIBRARIES CaloIdentifier StoreGateLib SGtests
+ LINK_LIBRARIES CaloIdentifier StoreGateLib
PRIVATE_LINK_LIBRARIES AthenaKernel GaudiKernel PathResolver )
# Install files from the package:
diff --git a/Calorimeter/CaloEvent/CMakeLists.txt b/Calorimeter/CaloEvent/CMakeLists.txt
index 39776224fdd061aac017a4f7523129c41b01f924..5a2cab4b510ebae8b0e3664ceb5b77da056999e7 100644
--- a/Calorimeter/CaloEvent/CMakeLists.txt
+++ b/Calorimeter/CaloEvent/CMakeLists.txt
@@ -1,43 +1,14 @@
-################################################################################
-# Package: CaloEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloEvent )
# Extra dependencies, based on the environment:
-set( extra_deps )
set( extra_libs )
if( NOT GENERATIONBASE )
- set( extra_deps LArCalorimeter/LArRawConditions ) # not ideal... LAr should depend on Calo
set( extra_libs LArRawConditions )
endif()
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Calorimeter/CaloConditions
- Calorimeter/CaloDetDescr
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Control/AthAllocators
- Control/AthContainers
- Control/AthLinks
- Control/AthenaKernel
- Control/CxxUtils
- Control/Navigation
- DetectorDescription/GeoPrimitives
- DetectorDescription/Identifier
- Event/EventKernel
- Event/FourMom
- Event/NavFourMom
- ${extra_deps}
- PRIVATE
- AtlasTest/TestTools
- Control/StoreGate
- DetectorDescription/IdDictParser
- GaudiKernel )
-
# External dependencies:
find_package( Boost )
find_package( CLHEP )
diff --git a/Calorimeter/CaloExample/CaloTests/CMakeLists.txt b/Calorimeter/CaloExample/CaloTests/CMakeLists.txt
index a5f2473b8234e7d3671796c38d8043579c265835..4b3ddcb9c00a2e57e04bbf1b1e7936f01a7c7bf3 100644
--- a/Calorimeter/CaloExample/CaloTests/CMakeLists.txt
+++ b/Calorimeter/CaloExample/CaloTests/CMakeLists.txt
@@ -1,46 +1,19 @@
-################################################################################
-# Package: CaloTests
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTests )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloDetDescr
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- Control/StoreGate
- DetectorDescription/Identifier
- GaudiKernel
- LArCalorimeter/LArElecCalib
- PRIVATE
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloSimEvent
- Control/AthenaKernel
- DetectorDescription/AtlasDetDescr
- Generators/AtlasHepMC
- Generators/GeneratorObjects
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArRawEvent
- LArCalorimeter/LArRawUtils
- LArCalorimeter/LArSimEvent
- LArCalorimeter/LArCabling )
-
# External dependencies:
find_package( AIDA )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_component( CaloTests
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${AIDA_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasHepMCLib CaloDetDescrLib CaloIdentifier AthenaBaseComps StoreGateLib SGtests Identifier GaudiKernel CaloEvent CaloGeoHelpers CaloSimEvent AthenaKernel AtlasDetDescr GeneratorObjects LArIdentifier LArRawEvent LArRawUtilsLib LArSimEvent LArCablingLib )
+ INCLUDE_DIRS ${AIDA_INCLUDE_DIRS}
+ LINK_LIBRARIES AtlasHepMCLib CaloDetDescrLib CaloIdentifier AthenaBaseComps StoreGateLib SGtests Identifier GaudiKernel CaloEvent CaloGeoHelpers CaloSimEvent AthenaKernel AtlasDetDescr GeneratorObjects LArIdentifier LArRawEvent LArRawUtilsLib LArSimEvent LArCablingLib )
# Install files from the package:
-atlas_install_headers( CaloTests )
atlas_install_joboptions( share/*.py )
atlas_install_runtime( test/CaloTests_TestConfiguration.xml share/*.C share/rttTest.css share/CaloTests_HistoComparison.txt share/*Checks.py )
diff --git a/Calorimeter/CaloIdentifier/CMakeLists.txt b/Calorimeter/CaloIdentifier/CMakeLists.txt
index 9a645822a8bf6607e1f188082f69ae7039d4cdc7..48b3b8ca1568f25b83cc686b102a825b548d318a 100644
--- a/Calorimeter/CaloIdentifier/CMakeLists.txt
+++ b/Calorimeter/CaloIdentifier/CMakeLists.txt
@@ -1,68 +1,43 @@
-################################################################################
-# Package: CaloIdentifier
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloIdentifier )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloGeoHelpers
- Control/AthenaKernel
- DetectorDescription/AtlasDetDescr
- DetectorDescription/IdDict
- DetectorDescription/Identifier
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/CxxUtils
- Control/StoreGate
- DetectorDescription/IdDictParser
- Tools/PathResolver )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( CaloIdentifier
src/*.cxx
PUBLIC_HEADERS CaloIdentifier
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools CxxUtils IdDictParser PathResolver )
+ LINK_LIBRARIES ${Boost_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel
+ PRIVATE_LINK_LIBRARIES CxxUtils IdDictParser PathResolver )
atlas_add_dictionary( CaloIdentifierDict
CaloIdentifier/CaloIdentifierDict.h
CaloIdentifier/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier )
atlas_add_executable( test_lar_id
test/test_lar_id.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier IdDictParser )
atlas_add_executable( test_calo_dm_id
test/test_calo_dm_id.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier IdDictParser )
atlas_add_executable( test_cell_id
test/test_cell_id.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier IdDictParser )
atlas_add_executable( test_lvl1_id
test/test_lvl1_id.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier IdDictParser )
atlas_add_executable( caloCellLookup
utils/caloCellLookup.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier IdDictParser )
#atlas_add_test( GTower_ID_test
# SOURCES
@@ -81,91 +56,79 @@ atlas_add_executable( caloCellLookup
atlas_add_test( LArEM_ID_test
SOURCES
test/LArEM_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( LArEM_SuperCell_ID_test
SOURCES
test/LArEM_SuperCell_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( LArHEC_ID_test
SOURCES
test/LArHEC_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( LArHEC_SuperCell_ID_test
SOURCES
test/LArHEC_SuperCell_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( LArFCAL_ID_test
SOURCES
test/LArFCAL_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( LArFCAL_SuperCell_ID_test
SOURCES
test/LArFCAL_SuperCell_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( LArMiniFCAL_ID_test
SOURCES
test/LArMiniFCAL_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( TileID_test
SOURCES
test/TileID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( Tile_SuperCell_ID_test
SOURCES
test/Tile_SuperCell_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( CaloCell_ID_test
SOURCES
test/CaloCell_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( CaloCell_SuperCell_ID_test
SOURCES
test/CaloCell_SuperCell_ID_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( CaloIDHelper_test
SOURCES
test/CaloIDHelper_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloGeoHelpers AthenaKernel AtlasDetDescr IdDict Identifier GaudiKernel TestTools CxxUtils StoreGateLib SGtests IdDictParser PathResolver CaloIdentifier
+ LINK_LIBRARIES CaloIdentifier IdDictParser
LOG_IGNORE_PATTERN "mask/zero|Reading file|^AtlasDetectorID(Helper)?::" )
atlas_add_test( CaloHelpersTest_test
SOURCES
test/CaloHelpersTest_test.cxx
- LINK_LIBRARIES CaloIdentifier )
+ LINK_LIBRARIES CaloIdentifier IdDictParser)
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Calorimeter/CaloInterface/CMakeLists.txt b/Calorimeter/CaloInterface/CMakeLists.txt
index cb86afa8e98dee83803acf77d5def03999076c86..d88a1b539a2854dfba7e2f5d1bb11c9a8ffcf7cd 100644
--- a/Calorimeter/CaloInterface/CMakeLists.txt
+++ b/Calorimeter/CaloInterface/CMakeLists.txt
@@ -1,32 +1,16 @@
-################################################################################
-# Package: CaloInterface
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloInterface )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloEvent
- Calorimeter/CaloIdentifier
- Calorimeter/CaloConditions
- Control/AthenaKernel
- DetectorDescription/Identifier
- Event/xAOD/xAODCaloEvent
- GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( CaloInterfaceLib
CaloInterface/*.h
INTERFACE
PUBLIC_HEADERS CaloInterface
- LINK_LIBRARIES AthenaKernel CaloConditions CaloEvent CaloIdentifier GaudiKernel xAODCaloEvent )
+ LINK_LIBRARIES AthenaKernel CaloConditions CaloEvent CaloIdentifier CxxUtils GaudiKernel xAODCaloEvent )
atlas_add_dictionary( CaloInterfaceDict
CaloInterface/CaloInterfaceDict.h
CaloInterface/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloInterfaceLib )
+ LINK_LIBRARIES CaloInterfaceLib )
diff --git a/Calorimeter/CaloLocalHadCalib/CMakeLists.txt b/Calorimeter/CaloLocalHadCalib/CMakeLists.txt
index 39c7914a7451a59d796becedf759fe93ad3df950..2b2959e7946045e8e948cd331f147fd6cece05bc 100644
--- a/Calorimeter/CaloLocalHadCalib/CMakeLists.txt
+++ b/Calorimeter/CaloLocalHadCalib/CMakeLists.txt
@@ -1,56 +1,27 @@
-################################################################################
-# Package: CaloLocalHadCalib
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloLocalHadCalib )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloConditions
- Calorimeter/CaloGeoHelpers
- Control/AthenaBaseComps
- Control/StoreGate
- Control/CxxUtils
- Event/xAOD/xAODCaloEvent
- GaudiKernel
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloDmDetDescr
- Calorimeter/CaloEvent
- Calorimeter/CaloIdentifier
- Calorimeter/CaloSimEvent
- Calorimeter/CaloUtils
- Control/AthenaKernel
- Generators/GeneratorObjects
- TestBeam/TBEvent
- Tools/PathResolver )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( CLHEP )
find_package( ROOT COMPONENTS Gpad Graf Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf3d Html Postscript Gui GX11TTF GX11 )
-# this line failed automatic conversion in cmt2cmake :
-# use AtlasReflex AtlasReflex-* External -no_CALOATHENAPOOL_ROOTauto_imports
-
# Component(s) in the package:
atlas_add_component( CaloLocalHadCalib
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloGeoHelpers AthenaBaseComps StoreGateLib CxxUtils
- SGtests xAODCaloEvent GaudiKernel CaloDetDescrLib CaloDmDetDescr CaloEvent CaloIdentifier CaloSimEvent CaloUtilsLib AthenaKernel GeneratorObjects TBEvent PathResolver )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel CaloConditions CaloDetDescrLib CaloDmDetDescr CaloEvent CaloGeoHelpers CaloIdentifier CaloSimEvent CaloUtilsLib CxxUtils GaudiKernel GeneratorObjects PathResolver StoreGateLib TBEvent xAODCaloEvent )
atlas_add_dictionary( CaloLocalHadCalibDict
CaloLocalHadCalib/CaloLocalHadCalibDict.h
CaloLocalHadCalib/selection.xml
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloGeoHelpers AthenaBaseComps StoreGateLib CxxUtils
- SGtests xAODCaloEvent GaudiKernel CaloDetDescrLib CaloDmDetDescr CaloEvent CaloIdentifier CaloSimEvent CaloUtilsLib AthenaKernel GeneratorObjects TBEvent PathResolver )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel CaloConditions CaloDetDescrLib CaloDmDetDescr CaloEvent CaloGeoHelpers CaloIdentifier CaloSimEvent CaloUtilsLib CxxUtils GaudiKernel GeneratorObjects PathResolver StoreGateLib TBEvent xAODCaloEvent )
# Install files from the package:
-atlas_install_headers( CaloLocalHadCalib )
atlas_install_joboptions( share/*.txt share/*.py )
atlas_install_runtime( share/CaloHadDMCoeff_init_v1.txt share/CaloHadDMCoeff_init_v2.txt )
diff --git a/Calorimeter/CaloLumiConditions/CMakeLists.txt b/Calorimeter/CaloLumiConditions/CMakeLists.txt
index e2cf193fd6fc6d1f6da20f313435c445bde713ef..55ba96083f619f8534c7b27edeb04b0e5a152457 100644
--- a/Calorimeter/CaloLumiConditions/CMakeLists.txt
+++ b/Calorimeter/CaloLumiConditions/CMakeLists.txt
@@ -1,22 +1,8 @@
-################################################################################
-# Package: CaloLumiConditions
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloLumiConditions )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/CxxUtils
- Control/AthenaKernel
- DetectorDescription/Identifier
- PRIVATE
- DetectorDescription/IdDictParser
- AtlasTest/TestTools
- LumiBlock/LumiBlockData
- LArCalorimeter/LArElecCalib
- LArCalorimeter/LArIdentifier )
-
# External dependencies:
find_package( Boost COMPONENTS timer )
@@ -24,21 +10,18 @@ find_package( Boost COMPONENTS timer )
atlas_add_library( CaloLumiConditions
src/*.cxx
PUBLIC_HEADERS CaloLumiConditions
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES CxxUtils Identifier AthenaKernel LArElecCalib
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} TestTools LArIdentifier LumiBlockData )
+ PRIVATE_LINK_LIBRARIES LArIdentifier LumiBlockData )
atlas_add_test( CaloBCIDCoeffs_test
SOURCES
test/CaloBCIDCoeffs_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} CxxUtils Identifier TestTools CaloLumiConditions IdDictParser LArIdentifier LArElecCalib )
+ LINK_LIBRARIES ${Boost_LIBRARIES} CaloLumiConditions IdDictParser LArIdentifier TestTools )
atlas_add_test( CaloBCIDLumi_test
SOURCES
test/CaloBCIDLumi_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} CxxUtils Identifier TestTools CaloLumiConditions IdDictParser LumiBlockData LArIdentifier LArElecCalib
+ LINK_LIBRARIES CaloLumiConditions IdDictParser LArIdentifier LumiBlockData TestTools
PROPERTIES TIMEOUT 300 )
-
-
diff --git a/Calorimeter/CaloRec/CMakeLists.txt b/Calorimeter/CaloRec/CMakeLists.txt
index 4ab7bf01e16e56f07df5df2dc1e5cda9fb3ff1ad..14602ddaf605d3416eb97bd1b8b85ac6a7aba222 100644
--- a/Calorimeter/CaloRec/CMakeLists.txt
+++ b/Calorimeter/CaloRec/CMakeLists.txt
@@ -1,44 +1,8 @@
-################################################################################
-# Package: CaloRec
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloRec )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Calorimeter/CaloConditions
- Calorimeter/CaloEvent
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/xAOD/xAODCaloEvent
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/CxxUtils
- Control/AthAllocators
- DetectorDescription/IdDictParser
- DetectorDescription/Identifier
- Event/EventKernel
- Event/FourMom
- Event/NavFourMom
- Event/xAOD/xAODEventInfo
- Calorimeter/CaloDetDescr
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Calorimeter/CaloUtils
- Calorimeter/CaloLumiConditions
- LArCalorimeter/LArTools
- LArCalorimeter/LArElecCalib
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArRawConditions
- LumiBlock/LumiBlockComps
- Control/AthenaMonitoringKernel )
-
# External dependencies:
find_package( AIDA )
find_package( CLHEP )
@@ -60,8 +24,7 @@ atlas_add_library( CaloRecLib
StoreGateLib LArToolsLib LumiBlockCompsLib AthenaMonitoringKernelLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES}
${EIGEN_LIBRARIES} AthAllocators IdDictParser EventKernel CaloLumiConditions
- LArRawConditions
- FourMom NavFourMom )
+ LArRawConditions FourMom NavFourMom )
atlas_add_component( CaloRec
src/components/*.cxx
diff --git a/Calorimeter/CaloSimEvent/CMakeLists.txt b/Calorimeter/CaloSimEvent/CMakeLists.txt
index 4c30237f5bba49348db4292d68d40dbd5bcf67e8..9feef2e380a81297565f956186ae1d4cc965c960 100644
--- a/Calorimeter/CaloSimEvent/CMakeLists.txt
+++ b/Calorimeter/CaloSimEvent/CMakeLists.txt
@@ -1,32 +1,16 @@
-################################################################################
-# Package: CaloSimEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloSimEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/Identifier
- Simulation/HitManagement
- PRIVATE
- GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( CaloSimEvent
src/*.cxx
PUBLIC_HEADERS CaloSimEvent
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES Identifier HitManagement
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel )
+ LINK_LIBRARIES AthenaKernel Identifier HitManagement
+ PRIVATE_LINK_LIBRARIES GaudiKernel )
atlas_add_dictionary( CaloSimEventDict
CaloSimEvent/CaloSimEventDict.h
CaloSimEvent/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} Identifier HitManagement GaudiKernel CaloSimEvent )
-
+ LINK_LIBRARIES CaloSimEvent )
diff --git a/Calorimeter/CaloTTDetDescr/CMakeLists.txt b/Calorimeter/CaloTTDetDescr/CMakeLists.txt
index 000a484ae74a5e3de38ab8ee433c8dd8df959c47..f156ec2c91eb7a9b1a31fac2ccc97bf36887b94a 100644
--- a/Calorimeter/CaloTTDetDescr/CMakeLists.txt
+++ b/Calorimeter/CaloTTDetDescr/CMakeLists.txt
@@ -1,21 +1,12 @@
-################################################################################
-# Package: CaloTTDetDescr
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTTDetDescr )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/Identifier
- PRIVATE
- Calorimeter/CaloIdentifier )
-
# Component(s) in the package:
atlas_add_library( CaloTTDetDescr
src/*.cxx
PUBLIC_HEADERS CaloTTDetDescr
- LINK_LIBRARIES Identifier
+ LINK_LIBRARIES AthenaKernel Identifier
PRIVATE_LINK_LIBRARIES CaloIdentifier )
diff --git a/Calorimeter/CaloTools/CMakeLists.txt b/Calorimeter/CaloTools/CMakeLists.txt
index a14f3bfad85ed815c73b071012d8d52ea70dcfa6..28fc0847ed4cc8d2c589f60aba7de1ae0585dfd6 100644
--- a/Calorimeter/CaloTools/CMakeLists.txt
+++ b/Calorimeter/CaloTools/CMakeLists.txt
@@ -1,45 +1,8 @@
-# $Id: CMakeLists.txt 740701 2016-04-15 18:22:55Z ssnyder $
-################################################################################
-# Package: CaloTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Calorimeter/CaloConditions
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/AthAllocators
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/AtlasDetDescr
- DetectorDescription/Identifier
- GaudiKernel
- LArCalorimeter/LArElecCalib
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArRecEvent
- LArCalorimeter/LArCabling
- LArCalorimeter/LArRawConditions
- LumiBlock/LumiBlockComps
- TileCalorimeter/TileConditions
- TileCalorimeter/TileEvent
- Control/CxxUtils
- PRIVATE
- Calorimeter/CaloCondBlobObjs
- Control/AthAllocators
- DetectorDescription/IdDictParser
- Event/xAOD/xAODBase
- Event/xAOD/xAODEventInfo
- TileCalorimeter/TileIdentifier )
-
# External dependencies:
find_package( Boost )
find_package( CLHEP )
@@ -49,22 +12,13 @@ find_package( ROOT COMPONENTS Core MathCore )
# Component(s) in the package:
atlas_add_component( CaloTools
CaloTools/*.h CaloTools/*.icc src/*.cxx 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} CaloConditions CaloDetDescrLib CaloEvent CaloGeoHelpers
- CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib
- AthenaPoolUtilities AtlasDetDescr Identifier GaudiKernel LArIdentifier
- LArRecEvent LArToolsLib LumiBlockCompsLib TileConditionsLib TileEvent
- CxxUtils CaloCondBlobObjs AthAllocators IdDictParser xAODBase xAODEventInfo
- TileIdentifier LArRawConditions CaloInterfaceLib )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel AthenaPoolUtilities AtlasDetDescr CaloCondBlobObjs CaloConditions CaloDetDescrLib CaloEvent CaloGeoHelpers CaloIdentifier CaloInterfaceLib CxxUtils GaudiKernel Identifier LArCablingLib LArElecCalib LArRawConditions LArRecEvent StoreGateLib TileConditionsLib TileEvent TileIdentifier xAODBase )
# Install files from the package:
-atlas_install_headers( CaloTools )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
-
atlas_add_test( CaloEstimatedGainToolConfig_test
SCRIPT python -m CaloTools.CaloEstimatedGainToolConfig
LOG_SELECT_PATTERN "ComponentAccumulator|^---|^IOVDbSvc" )
diff --git a/Calorimeter/CaloTrackUtils/CMakeLists.txt b/Calorimeter/CaloTrackUtils/CMakeLists.txt
index 3ce63604af145f938dabe5c2d93e39dfd476a808..a4898da6daa14010436cf153e72c1ea085e52212 100644
--- a/Calorimeter/CaloTrackUtils/CMakeLists.txt
+++ b/Calorimeter/CaloTrackUtils/CMakeLists.txt
@@ -1,39 +1,15 @@
-################################################################################
-# Package: CaloTrackUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTrackUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloRec
- GaudiKernel
- PRIVATE
- DetectorDescription/GeoPrimitives
- Event/xAOD/xAODCaloEvent
- Reconstruction/Particle
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkParticleBase
- Tracking/TrkEvent/TrkTrackLink
- Tracking/TrkEvent/VxVertex
- Tracking/TrkExtrapolation/TrkExInterfaces )
-
-# External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint )
-
# Component(s) in the package:
atlas_add_library( CaloTrackUtilsLib
src/*.cxx
PUBLIC_HEADERS CaloTrackUtils
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES GaudiKernel CaloRecLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} GeoPrimitives xAODCaloEvent Particle TrkSurfaces TrkParameters TrkParticleBase VxVertex TrkExInterfaces )
+ PRIVATE_LINK_LIBRARIES GeoPrimitives Particle TrkExInterfaces TrkParameters TrkParticleBase TrkSurfaces TrkTrackLink VxVertex xAODCaloEvent )
atlas_add_component( CaloTrackUtils
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES CaloTrackUtilsLib )
-
diff --git a/Calorimeter/CaloTrackingGeometry/CMakeLists.txt b/Calorimeter/CaloTrackingGeometry/CMakeLists.txt
index 6465c5c24b463435c3f1ea96081b7196276004b2..4e3a1b0b5e32ff8e07c5c9b75f6ed4687fd4a4f8 100644
--- a/Calorimeter/CaloTrackingGeometry/CMakeLists.txt
+++ b/Calorimeter/CaloTrackingGeometry/CMakeLists.txt
@@ -1,44 +1,18 @@
-################################################################################
-# Package: CaloTrackingGeometry
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTrackingGeometry )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- AtlasGeometryCommon/SubDetectorEnvelopes
- Calorimeter/CaloDetDescr
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrInterfaces
- PRIVATE
- Control/StoreGate
- TileCalorimeter/TileDetDescr
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkGeometrySurfaces
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkDetDescr/TrkVolumes )
-
-# External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
atlas_add_library( CaloTrackingGeometryLib
INTERFACE
PUBLIC_HEADERS CaloTrackingGeometry
- LINK_LIBRARIES GaudiKernel GeoPrimitives CaloIdentifier CaloGeoHelpers CaloDetDescrLib )
+ LINK_LIBRARIES AthenaBaseComps CaloDetDescrLib CaloGeoHelpers CaloIdentifier GaudiKernel GeoPrimitives SubDetectorEnvelopesLib TrkDetDescrInterfaces TrkDetDescrUtils )
# Component(s) in the package:
atlas_add_component( CaloTrackingGeometry
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CaloDetDescrLib CaloGeoHelpers CaloIdentifier AthenaBaseComps GeoPrimitives GaudiKernel TrkDetDescrInterfaces StoreGateLib SGtests TileDetDescr TrkDetDescrUtils TrkGeometry TrkGeometrySurfaces TrkSurfaces TrkVolumes SubDetectorEnvelopesLib CaloTrackingGeometryLib )
+ LINK_LIBRARIES CaloTrackingGeometryLib TileDetDescr TrkGeometry TrkGeometrySurfaces TrkSurfaces TrkVolumes)
atlas_add_dictionary( CaloTrackingGeometryDict
CaloTrackingGeometry/CaloTrackingGeometryDict.h
diff --git a/Calorimeter/CaloTriggerTool/CMakeLists.txt b/Calorimeter/CaloTriggerTool/CMakeLists.txt
index 41987f4cd29f8ddc3f3989c15171f87a3dc58c2a..c24a672fa974575fcd665741bebce6c9fc91eafa 100644
--- a/Calorimeter/CaloTriggerTool/CMakeLists.txt
+++ b/Calorimeter/CaloTriggerTool/CMakeLists.txt
@@ -1,44 +1,23 @@
-################################################################################
-# Package: CaloTriggerTool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloTriggerTool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloIdentifier
- Control/AthenaKernel
- Control/StoreGate
- DetectorDescription/Identifier
- GaudiKernel
- Trigger/TrigT1/TrigT1CaloCalibConditions
- PRIVATE
- Control/AthenaBaseComps
- LArCalorimeter/LArIdentifier
- LArCalorimeter/LArCabling )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( CaloTriggerToolLib
src/*.cxx
PUBLIC_HEADERS CaloTriggerTool
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier AthenaKernel Identifier GaudiKernel TrigT1CaloCalibConditions StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES AthenaBaseComps LArIdentifier LArCablingLib )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel CaloIdentifier GaudiKernel Identifier StoreGateLib TrigT1CaloCalibConditions
+ PRIVATE_LINK_LIBRARIES LArCablingLib LArIdentifier )
atlas_add_component( CaloTriggerTool
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES CaloTriggerToolLib AthenaBaseComps )
+ LINK_LIBRARIES CaloTriggerToolLib )
atlas_add_dictionary( CaloTriggerToolDict
CaloTriggerTool/CaloTriggerToolDict.h
CaloTriggerTool/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier AthenaKernel StoreGateLib SGtests Identifier GaudiKernel TrigT1CaloCalibConditions AthenaBaseComps LArIdentifier CaloTriggerToolLib )
+ LINK_LIBRARIES CaloTriggerToolLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Calorimeter/CaloUtils/CMakeLists.txt b/Calorimeter/CaloUtils/CMakeLists.txt
index a7a37b92e2a3a6f56a9e38a00e5eb14df7241c03..709f5a9381ad851a44eef0acaa43db2bfb6f79f0 100644
--- a/Calorimeter/CaloUtils/CMakeLists.txt
+++ b/Calorimeter/CaloUtils/CMakeLists.txt
@@ -11,11 +11,8 @@ find_package( CLHEP )
atlas_add_library( CaloUtilsLib CaloUtils/*.h CaloUtils/*.icc src/*.h src/*.cxx
PUBLIC_HEADERS CaloUtils
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES CaloConditions CaloEvent CaloGeoHelpers CaloIdentifier
- AthenaBaseComps AthenaKernel Navigation FourMom xAODCaloEvent xAODCore GaudiKernel
- CaloDetDescrLib StoreGateLib CaloInterfaceLib
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CxxUtils
- SGTools IdDictParser Identifier )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel CaloConditions CaloDetDescrLib CaloEvent CaloGeoHelpers CaloIdentifier CaloInterfaceLib CxxUtils FourMom GaudiKernel Navigation StoreGateLib xAODCaloEvent
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} GeoModelInterfaces Identifier SGTools )
atlas_add_component( CaloUtils src/components/*.cxx
LINK_LIBRARIES CaloUtilsLib )
@@ -33,24 +30,21 @@ set( _jobOPath "${_jobOPath}:$ENV{JOBOPTSEARCHPATH}" )
atlas_add_test( CaloLayerCalculator_test
SOURCES test/CaloLayerCalculator_test.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloDetDescrLib CaloEvent CaloIdentifier
- StoreGateLib xAODCaloEvent GaudiKernel TestTools IdDictParser CaloUtilsLib
+ LINK_LIBRARIES LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloUtilsLib CxxUtils IdDictParser TestTools
LOG_IGNORE_PATTERN "^lar decode|mask/zero|initialize_from_dict|^ channel range|^AtlasDetectorID::"
ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
atlas_add_test( CaloVertexedCell_test
SOURCES test/CaloVertexedCell_test.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloDetDescrLib CaloEvent CaloIdentifier
- StoreGateLib GaudiKernel TestTools IdDictParser CaloUtilsLib
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloUtilsLib TestTools
LOG_IGNORE_PATTERN "^lar decode|mask/zero|initialize_from_dict|^ channel range|^AtlasDetectorID::"
ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )
atlas_add_test( CaloVertexedCluster_test
SOURCES test/CaloVertexedCluster_test.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloDetDescrLib CaloIdentifier StoreGateLib
- xAODCaloEvent GaudiKernel TestTools IdDictParser CaloUtilsLib
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloUtilsLib TestTools
LOG_IGNORE_PATTERN "^lar decode|mask/zero|initialize_from_dict|^ channel range|^AtlasDetectorID::"
ENVIRONMENT "JOBOPTSEARCHPATH=${_jobOPath}" )