TileCalorimeter: cmake cleanup

Remove `atlas_depends_on_subdirs` and cleanup library dependencies.

TileCalorimeter/TileCosmicAlgs/CMakeLists.txt

-################################################################################
-# Package: TileCosmicAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileCosmicAlgs )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Calorimeter/CaloIdentifier
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          PRIVATE
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloEvent
-                          Commission/CommissionEvent
-                          Control/AthenaKernel
-                          DetectorDescription/Identifier
-                          Event/EventContainers
-                          TileCalorimeter/TileDetDescr
-                          TileCalorimeter/TileEvent
-                          TileCalorimeter/TileIdentifier )
-
 # External dependencies:
 find_package( CLHEP )
-find_package( ROOT COMPONENTS Minuit2 Core Tree MathCore Hist RIO pthread MathMore Minuit Matrix Physics HistPainter Rint )
+find_package( ROOT COMPONENTS Minuit2 Core )
 
 # Component(s) in the package:
 atlas_add_component( TileCosmicAlgs
-                     src/Tile*.cxx
+                     src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps GaudiKernel CaloDetDescrLib CaloEvent CommissionEvent AthenaKernel Identifier TileDetDescr TileEvent TileIdentifier )
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps GaudiKernel CaloDetDescrLib CaloEvent CommissionEvent AthenaKernel EventContainers Identifier StoreGateLib TileDetDescr TileEvent TileIdentifier )
 
 # Install files from the package:
-atlas_install_headers( TileCosmicAlgs )
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
 

TileCalorimeter/TileEvent/CMakeLists.txt

-################################################################################
-# Package: TileEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileEvent )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Calorimeter/CaloEvent
-                          Control/AthenaKernel
-                          Control/AthContainers
-                          Control/StoreGate
-                          DetectorDescription/Identifier
-                          Event/EventContainers
-                          GaudiKernel
-                          TileCalorimeter/TileConditions
-                          TileCalorimeter/TileIdentifier
-                          TileCalorimeter/TileSimEvent
-                          PRIVATE
-                          DetectorDescription/IdDictParser
-                          TileCalorimeter/TileCalib/TileCalibBlobObjs
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloIdentifier )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_library( TileEvent
                    src/Tile*.cxx
                    PUBLIC_HEADERS TileEvent
-                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES CaloEvent AthContainers Identifier GaudiKernel TileIdentifier TileSimEvent StoreGateLib SGtests TileConditionsLib CaloDetDescrLib EventContainers
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier AthenaKernel TileCalibBlobObjs )
+                   LINK_LIBRARIES CaloEvent AthContainers AthenaKernel Identifier GaudiKernel TileIdentifier TileSimEvent StoreGateLib TileConditionsLib EventContainers
+                   PRIVATE_LINK_LIBRARIES CaloDetDescrLib CaloIdentifier TileCalibBlobObjs )
 
 atlas_add_dictionary( TileEventDict
                       TileEvent/TileEventDict.h
                       TileEvent/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} CaloEvent AthContainers StoreGateLib SGtests Identifier GaudiKernel TileConditionsLib TileIdentifier TileSimEvent CaloDetDescrLib CaloIdentifier AthenaKernel TileEvent EventContainers )
-
+                      LINK_LIBRARIES TileEvent )
 
+# Tests in the package:
 atlas_add_test( TileRawChannelCollection_test
                 SOURCES
                 test/TileRawChannelCollection_test.cxx
                 LINK_LIBRARIES TileEvent )
 
-
 atlas_add_test( TileDigitsCollection_test
                 SOURCES
                 test/TileDigitsCollection_test.cxx
@@ -62,29 +36,27 @@ atlas_add_test( TileBeamElemCollection_test
                 test/TileBeamElemCollection_test.cxx
                 LINK_LIBRARIES TileEvent )
 
-
 atlas_add_test( TileMutableDataContainer_test
                 SOURCES
                 test/TileMutableDataContainer_test.cxx
-                LINK_LIBRARIES TileEvent IdDictParser )
-
+                LINK_LIBRARIES IdDictParser TileConditionsLib TileEvent TileIdentifier )
 
 atlas_add_test( TileMutableRawChannelContainer_test
                 SOURCES
                 test/TileMutableRawChannelContainer_test.cxx
-                LINK_LIBRARIES TileEvent IdDictParser )
+                LINK_LIBRARIES IdDictParser TileConditionsLib TileEvent TileIdentifier )
 
 atlas_add_test( TileMutableDigitsContainer_test
                 SOURCES
                 test/TileMutableDigitsContainer_test.cxx
-                LINK_LIBRARIES TileEvent IdDictParser )
+                LINK_LIBRARIES IdDictParser TileConditionsLib TileEvent TileIdentifier )
 
 atlas_add_test( TileMutableHitContainer_test
                 SOURCES
                 test/TileMutableHitContainer_test.cxx
-                LINK_LIBRARIES TileEvent IdDictParser )
+                LINK_LIBRARIES IdDictParser TileConditionsLib TileEvent TileIdentifier )
 
 atlas_add_test( TileMutableBeamElemContainer_test
                 SOURCES
                 test/TileMutableBeamElemContainer_test.cxx
-                LINK_LIBRARIES TileEvent IdDictParser )
+                LINK_LIBRARIES IdDictParser TileConditionsLib TileEvent TileIdentifier )

TileCalorimeter/TileFastCaloSim/CMakeLists.txt

-################################################################################
-# Package: TileFastCaloSim
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileFastCaloSim )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          
-                          PRIVATE
-                          Calorimeter/CaloEvent
-                          Calorimeter/CaloIdentifier
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          Event/EventContainers
-                          GaudiKernel
-                          Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent
-                          TileCalorimeter/TileConditions
-                          TileCalorimeter/TileDetDescr
-                          TileCalorimeter/TileG4/TileG4Interfaces
-                          TileCalorimeter/TileGeoModel
-                          TileCalorimeter/TileSimEvent )
-
 # External dependencies:
 find_package( CLHEP )
-find_package( Geant4 )
-find_package( XercesC )
 
 # Component(s) in the package:
 atlas_add_component( TileFastCaloSim
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${GEANT4_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent CaloIdentifier AthenaBaseComps AthenaKernel GaudiKernel ISF_FastCaloSimEvent TileConditionsLib TileDetDescr TileGeoModelLib TileG4InterfacesLib TileSimEvent )
+                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloEvent CaloIdentifier AthenaBaseComps AthenaKernel EventContainers GaudiKernel GeoModelInterfaces ISF_FastCaloSimEvent TileConditionsLib TileDetDescr TileGeoModelLib TileG4InterfacesLib TileSimEvent )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )

TileCalorimeter/TileG4/TileG4Interfaces/CMakeLists.txt

-################################################################################
-# Package: TileG4Interfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileG4Interfaces )
@@ -12,4 +10,5 @@ atlas_add_library( TileG4InterfacesLib
                    TileG4Interfaces/*.h
                    INTERFACE
                    PUBLIC_HEADERS TileG4Interfaces
-                   LINK_LIBRARIES GaudiKernel Identifier )
+                   INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${GEANT4_LIBRARIES} GaudiKernel Identifier )

TileCalorimeter/TileIdentifier/CMakeLists.txt

-################################################################################
-# Package: TileIdentifier
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileIdentifier )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Calorimeter/CaloIdentifier
-                          DetectorDescription/Identifier
-                          PRIVATE
-                          DetectorDescription/IdDict
-                          GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_library( TileIdentifier
                    src/Tile*.cxx
                    PUBLIC_HEADERS TileIdentifier
-                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
                    LINK_LIBRARIES CaloIdentifier Identifier
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} IdDict GaudiKernel )
+                   PRIVATE_LINK_LIBRARIES IdDict GaudiKernel )
 
 atlas_add_dictionary( TileIdentifierDict
                       TileIdentifier/TileIdentifierDict.h
                       TileIdentifier/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier Identifier IdDict GaudiKernel TileIdentifier )
+                      LINK_LIBRARIES TileIdentifier )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

TileCalorimeter/TileL2Algs/CMakeLists.txt

-################################################################################
-# Package: TileL2Algs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileL2Algs )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          TileCalorimeter/TileEvent
-                          TileCalorimeter/TileIdentifier
-                          PRIVATE
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloIdentifier
-                          Control/AthenaKernel
-                          TileCalorimeter/TileCalib/TileCalibBlobObjs
-                          TileCalorimeter/TileConditions
-                          TileCalorimeter/TileDetDescr )
-
 # Component(s) in the package:
 atlas_add_library( TileL2AlgsLib
                    src/*.cxx
                    PUBLIC_HEADERS TileL2Algs
-                   LINK_LIBRARIES AthenaBaseComps GaudiKernel TileEvent TileIdentifier CaloDetDescrLib TileConditionsLib
-                   PRIVATE_LINK_LIBRARIES CaloIdentifier AthenaKernel TileCalibBlobObjs TileDetDescr )
+                   LINK_LIBRARIES AthenaBaseComps GaudiKernel StoreGateLib TileEvent TileIdentifier TileConditionsLib
+                   PRIVATE_LINK_LIBRARIES CaloDetDescrLib CaloIdentifier AthenaKernel TileCalibBlobObjs TileDetDescr )
 
 atlas_add_component( TileL2Algs
                      src/components/*.cxx

TileCalorimeter/TilePulseSimulator/CMakeLists.txt

-################################################################################
-# Package: TilePulseSimulator
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TilePulseSimulator )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          GaudiKernel )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Hist Core Tree MathCore RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint )
 

TileCalorimeter/TileRawUtils/CMakeLists.txt

-################################################################################
-# Package: TileRawUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileRawUtils )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Calorimeter/CaloIdentifier
-                          Control/AthenaBaseComps
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          TileCalorimeter/TileEvent
-                          TileCalorimeter/TileIdentifier
-                          PRIVATE
-                          Calorimeter/CaloDetDescr
-                          Control/StoreGate
-			  DetectorDescription/IRegionSelector	
-                          DetectorDescription/RegionSelector
-			  InnerDetector/InDetConditions/PixelConditionsData
-                          TileCalorimeter/TileConditions
-                          TileCalorimeter/TileDetDescr
-			  TileCalorimeter/TileSvc/TileByteStream )
+# External dependencies:
+find_package( tdaq-common COMPONENTS ers )
 
 # Component(s) in the package:
 atlas_add_component( TileRawUtils
                      src/Tile*.cxx
                      src/Reg*.cxx
                      src/components/*.cxx
-                     LINK_LIBRARIES CaloIdentifier AthenaBaseComps Identifier GaudiKernel TileEvent TileIdentifier CaloDetDescrLib StoreGateLib SGtests RegionSelectorLib TileConditionsLib TileDetDescr TileByteStreamLib PixelConditionsData )
-
-# Install files from the package:
-atlas_install_headers( TileRawUtils )
-
+                     INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} CaloIdentifier AthenaBaseComps Identifier GaudiKernel TileEvent TileIdentifier CaloDetDescrLib StoreGateLib IRegionSelector RegionSelectorLib TileCalibBlobObjs TileConditionsLib TileDetDescr TileByteStreamLib PixelConditionsData )

TileCalorimeter/TileRec/CMakeLists.txt

-################################################################################
-# Package: TileRec
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileRec )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          GaudiKernel
-                          TileCalorimeter/TileConditions
-                          TileCalorimeter/TileEvent
-                          TileCalorimeter/TileIdentifier
-                          PRIVATE
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloEvent
-                          Calorimeter/CaloIdentifier
-                          DetectorDescription/Identifier
-                          Event/EventContainers
-                          Event/xAOD/xAODEventInfo
-                          TileCalorimeter/TileCalib/TileCalibBlobObjs
-                          TileCalorimeter/TileDetDescr
-                          TileCalorimeter/TileL2Algs
-                          TileCalorimeter/TileRecUtils
-                          TileCalorimeter/TileSimEvent
-                          TileCalorimeter/TileSvc/TileByteStream )
-
 # External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-find_package( tdaq-common )
+find_package( Boost )
+find_package( ROOT COMPONENTS Core Tree )
 
 # Component(s) in the package:
 atlas_add_component( TileRec
                      src/Tile*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TileConditionsLib TileEvent TileIdentifier CaloDetDescrLib CaloEvent CaloIdentifier Identifier xAODEventInfo TileCalibBlobObjs TileDetDescr TileL2AlgsLib TileRecUtilsLib TileSimEvent TileByteStreamLib )
+                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel EventContainers GaudiKernel TileConditionsLib TileEvent TileIdentifier CaloDetDescrLib CaloEvent CaloIdentifier Identifier xAODEventInfo StoreGateLib TileCalibBlobObjs TileDetDescr TileL2AlgsLib TileSimEvent TileByteStreamLib )
 
 # Install files from the package:
-atlas_install_headers( TileRec )
 atlas_install_joboptions( share/*.py )
-

TileCalorimeter/TileRecAlgs/CMakeLists.txt

-
-################################################################################
-# Package: TileRecAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileRecAlgs )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Calorimeter/CaloIdentifier
-                          Control/AthenaBaseComps
-                          Control/StoreGate
-                          GaudiKernel
-                          TileCalorimeter/TileIdentifier
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloEvent
-                          Control/AthenaKernel
-                          DetectorDescription/Identifier
-                          DetectorDescription/IdDictParser
-                          Event/EventContainers
-                          Event/xAOD/xAODEventInfo
-                          TileCalorimeter/TileCalib/TileCalibBlobObjs
-                          TileCalorimeter/TileConditions
-                          TileCalorimeter/TileDetDescr
-                          TileCalorimeter/TileEvent
-                          TileCalorimeter/TileRecUtils
-                          TileCalorimeter/TileSimEvent )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( CLHEP )
@@ -39,16 +13,7 @@ atlas_add_component( TileRecAlgs
                      src/MBTSTimeDiffEventInfoAlg.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CaloIdentifier AthenaBaseComps StoreGateLib SGtests GaudiKernel TileIdentifier CaloDetDescrLib CaloEvent AthenaKernel Identifier xAODEventInfo TileCalibBlobObjs TileConditionsLib TileDetDescr TileEvent TileRecUtilsLib TileSimEvent EventContainers )
-
-
-atlas_add_test( TileDigitsThresholdFilter_test
-                SOURCES test/TileDigitsThresholdFilter_test.cxx
-                LINK_LIBRARIES TileEvent TileIdentifier TileConditionsLib AthenaBaseComps StoreGateLib IdDictParser TestTools GaudiKernel)
-# Needed for the plugin service to see the test components
-# defined in the test binary.
-set_target_properties( TileRecAlgs_TileDigitsThresholdFilter_test PROPERTIES ENABLE_EXPORTS True )
-
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CaloIdentifier CaloInterfaceLib AthContainers AthenaBaseComps CxxUtils StoreGateLib GaudiKernel TileIdentifier CaloDetDescrLib CaloEvent AthenaKernel Identifier xAODEventInfo TileCalibBlobObjs TileConditionsLib TileDetDescr TileEvent TileRecUtilsLib TileSimEvent EventContainers )
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
@@ -64,3 +29,10 @@ atlas_add_test( TileDigitsFilterConfig_test
                 SCRIPT python -m TileRecAlgs.TileDigitsFilterConfig
                 PROPERTIES TIMEOUT 300
                 POST_EXEC_SCRIPT nopost.sh)
+
+atlas_add_test( TileDigitsThresholdFilter_test
+                SOURCES test/TileDigitsThresholdFilter_test.cxx
+                LINK_LIBRARIES TileEvent TileIdentifier TileConditionsLib AthenaBaseComps StoreGateLib IdDictParser TestTools GaudiKernel)
+# Needed for the plugin service to see the test components
+# defined in the test binary.
+set_target_properties( TileRecAlgs_TileDigitsThresholdFilter_test PROPERTIES ENABLE_EXPORTS True )

TileCalorimeter/TileRecUtils/CMakeLists.txt

-################################################################################
-# Package: TileRecUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileRecUtils )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Calorimeter/CaloConditions
-                          Calorimeter/CaloIdentifier
-                          Calorimeter/CaloInterface
-                          Calorimeter/CaloUtils
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          DetectorDescription/Identifier
-                          GaudiKernel
-                          TileCalorimeter/TileConditions
-                          TileCalorimeter/TileEvent
-                          TileCalorimeter/TileSimEvent
-                          TileCalorimeter/TileIdentifier
-                          PRIVATE
-                          Control/CxxUtils
-                          Calorimeter/CaloDetDescr
-                          Calorimeter/CaloEvent
-                          Control/AthAllocators
-                          Control/StoreGate
-                          Event/EventContainers
-                          Event/xAOD/xAODEventInfo
-                          TileCalorimeter/TileCalib/TileCalibBlobObjs
-                          TileCalorimeter/TileDetDescr
-                          Tools/PathResolver
-                          Trigger/TrigAnalysis/TrigAnalysisInterfaces )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core )
 find_package( CLHEP )
 
 # Component(s) in the package:
@@ -44,8 +14,8 @@ atlas_add_library( TileRecUtilsLib
                    INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
                    PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
                    DEFINITIONS ${CLHEP_DEFINITIONS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloConditions CaloIdentifier AthenaBaseComps AthenaKernel Identifier GaudiKernel TileEvent TileSimEvent TileIdentifier CaloUtilsLib TileConditionsLib CaloDetDescrLib StoreGateLib SGtests CxxUtils TrigAnalysisInterfaces
-                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} CaloEvent AthAllocators xAODEventInfo TileCalibBlobObjs TileDetDescr PathResolver )
+                   LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloConditions CaloIdentifier AthenaBaseComps AthenaKernel Identifier GaudiKernel TileEvent TileIdentifier TileConditionsLib CaloInterfaceLib CaloUtilsLib StoreGateLib TrigAnalysisInterfaces xAODEventInfo
+                   PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} AthAllocators CaloDetDescrLib CaloEvent CxxUtils EventContainers GeoModelInterfaces PathResolver TileCalibBlobObjs TileDetDescr TileSimEvent )
 
 atlas_add_component( TileRecUtils
                      src/components/*.cxx
@@ -59,16 +29,14 @@ atlas_install_joboptions( share/*.py )
 atlas_add_dictionary( TileRecUtilsDict
                       TileRecUtils/TileRecUtilsDict.h
                       TileRecUtils/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} TileRecUtilsLib )
-
+                      LINK_LIBRARIES TileRecUtilsLib )
 
+# Tests:
 atlas_add_test( TileCellBuilder_test
   SCRIPT test/TileCellBuilder_test.sh
   PROPERTIES TIMEOUT 600
   LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|No RecFlags available|IOVDbSvc +INFO" )
 
-
 # The entries 
 # IncrementalExecutor::executeFunction|You are probably missing the definition|Maybe you need to load
 # are to work around an abi issue seen in gcc6 vs cling.
@@ -78,25 +46,21 @@ atlas_add_test( TileCellBuilderFromHit_test
   PROPERTIES TIMEOUT 600
   LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|IncrementalExecutor::executeFunction|You are probably missing the definition|Maybe you need to load|No RecFlags available|IOVDbSvc +INFO" )
 
-
 atlas_add_test( TileRawChannelBuilder_test
   SCRIPT test/TileRawChannelBuilder_test.sh
   PROPERTIES TIMEOUT 600
   LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|No RecFlags available|IOVDbSvc +INFO" )
 
-
 atlas_add_test( TileDQstatusAlg_test
   SCRIPT test/TileDQstatusAlg_test.sh
   PROPERTIES TIMEOUT 600
   LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|No RecFlags available|IOVDbSvc +INFO" )
 
-
 atlas_add_test( TileDQstatusTool_test
   SCRIPT test/TileDQstatusTool_test.sh
   PROPERTIES TIMEOUT 600
   LOG_IGNORE_PATTERN "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile|Cache alignment|No RecFlags available|IOVDbSvc +INFO" )
 
-# Tests:
 atlas_add_test( TileRawChannelBuilderFitConfig_test
                  SCRIPT python -m TileRecUtils.TileRawChannelBuilderFitConfig
                  PROPERTIES TIMEOUT 300

TileCalorimeter/TileSimEvent/CMakeLists.txt

-################################################################################
-# Package: TileSimEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileSimEvent )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          DetectorDescription/Identifier
-                          Simulation/HitManagement
-                          
-                          PRIVATE
-                          Calorimeter/CaloIdentifier
-                          TileCalorimeter/TileConditions )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_library( TileSimEvent
                    src/*.cxx
                    PUBLIC_HEADERS TileSimEvent
-                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES AthenaKernel Identifier HitManagement TileConditionsLib
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} CaloIdentifier )
+                   LINK_LIBRARIES AthenaKernel Identifier HitManagement
+                   PRIVATE_LINK_LIBRARIES CaloIdentifier TileConditionsLib )
 
 atlas_add_dictionary( TileSimEventDict
                       TileSimEvent/TileSimEventDict.h
                       TileSimEvent/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel Identifier HitManagement CaloIdentifier TileConditionsLib TileSimEvent )
-
+                      LINK_LIBRARIES TileSimEvent )

TileCalorimeter/TileSvc/TileIdCnv/CMakeLists.txt

-################################################################################
-# Package: TileIdCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileIdCnv )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          DetectorDescription/DetDescrCnvSvc
-                          PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/IdDictDetDescr
-                          GaudiKernel
-                          TileCalorimeter/TileIdentifier )
-
 # Component(s) in the package:
 atlas_add_component( TileIdCnv
-                     src/Tile*.cxx
-                     LINK_LIBRARIES DetDescrCnvSvcLib StoreGateLib SGtests IdDictDetDescr GaudiKernel TileIdentifier )
+                     src/*.cxx
+                     LINK_LIBRARIES DetDescrCnvSvcLib StoreGateLib IdDictDetDescr GaudiKernel TileIdentifier )
 
 # Install files from the package:
-atlas_install_headers( TileIdCnv )
 atlas_install_joboptions( share/*.py )
-

TileCalorimeter/TileSvc/TileSimEventTPCnv/CMakeLists.txt

-################################################################################
-# Package: TileSimEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileSimEventTPCnv )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          TileCalorimeter/TileSimEvent
-                          PRIVATE
-                          AtlasTest/TestTools
-                          GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_library( TileSimEventTPCnv
                    src/*.cxx
                    PUBLIC_HEADERS TileSimEventTPCnv
-                   INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${ROOT_LIBRARIES} TileSimEvent AthenaPoolCnvSvcLib
-                   PRIVATE_LINK_LIBRARIES TestTools GaudiKernel )
+                   LINK_LIBRARIES TileSimEvent AthenaPoolCnvSvcLib )
 
 atlas_add_dictionary( TileSimEventTPCnvDict
                       TileSimEventTPCnv/TileSimEventTPCnvDict.h
                       TileSimEventTPCnv/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileSimEvent TestTools GaudiKernel TileSimEventTPCnv )
+                      LINK_LIBRARIES TileSimEventTPCnv )
 
 atlas_add_dictionary( OLD_TileSimEventTPCnvDict
                       TileSimEventTPCnv/TileSimEventTPCnvDict.h
                       TileSimEventTPCnv/OLD_selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileSimEvent TestTools GaudiKernel TileSimEventTPCnv )
+                      LINK_LIBRARIES TileSimEventTPCnv )
 
+# Tests in the package:
 atlas_add_test( TileHitCnv_p1_test
                 SOURCES
                 test/TileHitCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileSimEvent TestTools GaudiKernel TileSimEventTPCnv )
+                LINK_LIBRARIES GaudiKernel TestTools TileSimEventTPCnv )
 
 atlas_add_test( TileHitVectorCnv_p1_test
                 SOURCES
                 test/TileHitVectorCnv_p1_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileSimEvent TestTools GaudiKernel TileSimEventTPCnv )
-
+                LINK_LIBRARIES GaudiKernel TestTools TileSimEventTPCnv )

TileCalorimeter/TileSvc/TileTPCnv/CMakeLists.txt

-################################################################################
-# Package: TileTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileTPCnv )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          Event/EventContainers
-                          TileCalorimeter/TileEvent
-                          TileCalorimeter/TileSvc/TileSimEventTPCnv
-                          PRIVATE
-                          AtlasTest/TestTools
-                          Control/AthenaKernel
-                          DetectorDescription/IdDictParser
-                          GaudiKernel
-                          TileCalorimeter/TileConditions
-                          TileCalorimeter/TileIdentifier )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_tpcnv_library( TileTPCnv
                          src/*.cxx
                          PUBLIC_HEADERS TileTPCnv
-                         INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                         LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier )
+                         LINK_LIBRARIES AthenaPoolCnvSvcLib EventContainers TileEvent TileSimEventTPCnv
+                         PRIVATE_LINK_LIBRARIES AthenaKernel )
 
 atlas_add_dictionary( TileTPCnvDict
                       TileTPCnv/TileTPCnvDict.h
                       TileTPCnv/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv )
+                      LINK_LIBRARIES TileTPCnv )
 
 atlas_add_dictionary( OLD_TileTPCnvDict
                       TileTPCnv/TileTPCnvDict.h
                       TileTPCnv/OLD_selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv )
+                      LINK_LIBRARIES TileTPCnv )
 
+# Tests in the package:
 atlas_add_test( TileBeamElemCnv_p1_test
                 SOURCES
                 test/TileBeamElemCnv_p1_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv )
+                LINK_LIBRARIES LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv )
 
 atlas_add_test( TileBeamElemContainerCnv_p1_test
                 SOURCES
                 test/TileBeamElemContainerCnv_p1_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv
+                LINK_LIBRARIES LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv
                 LOG_IGNORE_PATTERN "initialize_from_dictionary" )
 
 atlas_add_test( TileCosmicMuonCnv_p1_test
                 SOURCES
                 test/TileCosmicMuonCnv_p1_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv )
+                LINK_LIBRARIES GaudiKernel TestTools TileTPCnv )
 
 atlas_add_test( TileCosmicMuonCnv_p2_test
                 SOURCES
                 test/TileCosmicMuonCnv_p2_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv )
+                LINK_LIBRARIES LINK_LIBRARIES GaudiKernel TestTools TileTPCnv )
 
 atlas_add_test( TileDigitsCnv_p1_test
                 SOURCES
                 test/TileDigitsCnv_p1_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv )
+                LINK_LIBRARIES LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv )
 
 atlas_add_test( TileDigitsCnv_p2_test
                 SOURCES
                 test/TileDigitsCnv_p2_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv )
+                LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv )
 
 atlas_add_test( TileDigitsCnv_p3_test
                 SOURCES
                 test/TileDigitsCnv_p3_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv )
+                LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv )
 
 atlas_add_test( TileDigitsContainerCnv_p1_test
                 SOURCES
                 test/TileDigitsContainerCnv_p1_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv
+                LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv
                 LOG_IGNORE_PATTERN "initialize_from_dictionary" )
 
 atlas_add_test( TileDigitsContainerCnv_p2_test
                 SOURCES
                 test/TileDigitsContainerCnv_p2_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv
+                LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv
                 LOG_IGNORE_PATTERN "initialize_from_dictionary" )
 
 atlas_add_test( TileDigitsContainerCnv_p3_test
                 SOURCES
                 test/TileDigitsContainerCnv_p3_test.cxx
                 INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv
+                LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv
                 LOG_IGNORE_PATTERN "initialize_from_dictionary" )
 
 atlas_add_test( TileHitContainerCnv_p1_test
                 SOURCES
                 test/TileHitContainerCnv_p1_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv
+                LINK_LIBRARIES LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv
                 LOG_IGNORE_PATTERN "initialize_from_dictionary" )
 
 atlas_add_test( TileRawChannelCnv_p1_test
                 SOURCES
                 test/TileRawChannelCnv_p1_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv )
+                LINK_LIBRARIES LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv )
 
 atlas_add_test( TileRawChannelContainerCnv_p1_test
                 SOURCES
                 test/TileRawChannelContainerCnv_p1_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv
+                LINK_LIBRARIES GaudiKernel IdDictParser TestTools TileConditionsLib TileIdentifier TileTPCnv
                 LOG_IGNORE_PATTERN "initialize_from_dictionary" )
 
 atlas_add_test( TileTTL1CellCnv_p1_test
                 SOURCES
                 test/TileTTL1CellCnv_p1_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv )
+                LINK_LIBRARIES GaudiKernel TestTools TileTPCnv )
 
 atlas_add_test( TileTTL1Cnv_p1_test
                 SOURCES
                 test/TileTTL1Cnv_p1_test.cxx
-                INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TileEvent TileSimEventTPCnv TestTools AthenaKernel IdDictParser GaudiKernel TileConditionsLib TileIdentifier TileTPCnv )
-
+                LINK_LIBRARIES GaudiKernel TestTools TileTPCnv )

TileCalorimeter/TileTBRec/CMakeLists.txt

-################################################################################
-# Package: TileTBRec
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileTBRec )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          TileCalorimeter/TileConditions
-                          TileCalorimeter/TileIdentifier
-                          TileCalorimeter/TileSvc/TileByteStream
-                          PRIVATE
-                          Calorimeter/CaloEvent
-                          Calorimeter/CaloIdentifier
-                          Control/AthenaKernel
-                          Control/StoreGate
-                          Event/ByteStreamCnvSvcBase
-                          Event/xAOD/xAODEventInfo
-                          TileCalorimeter/TileCalib/TileCalibBlobObjs
-                          TileCalorimeter/TileEvent
-                          TileCalorimeter/TileRecUtils
-                          Tools/PathResolver )
-
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
 find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -34,10 +13,9 @@ atlas_add_component( TileTBRec
                      src/Tile*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps GaudiKernel TileConditionsLib TileIdentifier TileByteStreamLib CaloEvent CaloIdentifier AthenaKernel StoreGateLib SGtests ByteStreamCnvSvcBaseLib xAODEventInfo TileCalibBlobObjs TileEvent TileRecUtilsLib PathResolver )
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps AthContainers GaudiKernel TileConditionsLib TileIdentifier TileByteStreamLib CaloEvent CaloIdentifier AthenaKernel StoreGateLib ByteStreamCnvSvcBaseLib xAODEventInfo TileCalibBlobObjs TileEvent TileSimEvent TileRecUtilsLib PathResolver )
 
 # Install files from the package:
-atlas_install_headers( TileTBRec )
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( share/TileEtaCTB.txt )
 

TileCalorimeter/TileTrackingGeometry/CMakeLists.txt

-################################################################################
-# Package: TileTrackingGeometry
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TileTrackingGeometry )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Calorimeter/CaloTrackingGeometry
-                          Control/AthenaBaseComps
-                          GaudiKernel
-                          Tracking/TrkDetDescr/TrkDetDescrInterfaces
-                          PRIVATE
-                          Calorimeter/CaloDetDescr
-                          Control/StoreGate
-                          TileCalorimeter/TileDetDescr
-                          Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv
-                          Tracking/TrkDetDescr/TrkDetDescrUtils
-                          Tracking/TrkDetDescr/TrkGeometry
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkDetDescr/TrkVolumes )
-
 # External dependencies:
-find_package( CLHEP )
-find_package( Eigen )
 find_package( GeoModelCore )
 
 # Component(s) in the package:
 atlas_add_component( TileTrackingGeometry
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps GaudiKernel TrkDetDescrInterfaces CaloDetDescrLib StoreGateLib SGtests GeoPrimitives TileDetDescr TrkDetDescrGeoModelCnv TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes CaloTrackingGeometryLib )
+                     INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaBaseComps GaudiKernel TrkDetDescrInterfaces CaloDetDescrLib StoreGateLib TileDetDescr TrkDetDescrGeoModelCnv TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes CaloTrackingGeometryLib )
 
 # Install files from the package:
-atlas_install_headers( TileTrackingGeometry )
 atlas_install_python_modules( python/*.py )
-