diff --git a/MuonSpectrometer/MuonConditions/MuonByteStreamErrors/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonByteStreamErrors/CMakeLists.txt
index 2ff4ae20424e221076a9c102307fe3714f7c5295..722f9aa5113583a04459403398c80a2392446450 100644
--- a/MuonSpectrometer/MuonConditions/MuonByteStreamErrors/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonByteStreamErrors/CMakeLists.txt
@@ -5,12 +5,6 @@
# Declare the package name:
atlas_subdir( MuonByteStreamErrors )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthContainers
- DetectorDescription/Identifier )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondCabling/MDT_CondCabling/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondCabling/MDT_CondCabling/CMakeLists.txt
index 1af32fcd82d854daa5754a30b0b2192db4c1c6b3..ab5d224750dde956f60cb2c705070a75cdef3a25 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondCabling/MDT_CondCabling/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondCabling/MDT_CondCabling/CMakeLists.txt
@@ -5,22 +5,6 @@
# Declare the package name:
atlas_subdir( MDT_CondCabling )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- GaudiKernel
- MuonSpectrometer/MuonCablings/MuonCablingData
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
- PRIVATE
- Control/SGTools
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc
- MuonSpectrometer/MuonIdHelpers
- Tools/PathResolver )
-
# External dependencies:
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling/CMakeLists.txt
index 531c6d5236a35f151fa4cd7ef52f29d3b6d768ee..29dd6693236355ea0f72138bf206f90fd82bb430 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling/CMakeLists.txt
@@ -5,20 +5,6 @@
# Declare the package name:
atlas_subdir( RPC_CondCabling )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
- MuonSpectrometer/MuonCablings/MuonCablingTools
- PRIVATE
- Control/SGTools
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- MuonSpectrometer/MuonIdHelpers
- Tools/PathResolver )
-
# External dependencies:
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/CMakeLists.txt
index 3a35556ccbf486a1d61e9a3876c26019849d18f8..64de1c6fc26515bf2856bde58a09bbfa38811507 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondCabling/TGC_CondCabling/CMakeLists.txt
@@ -5,16 +5,6 @@
# Declare the package name:
atlas_subdir( TGC_CondCabling )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
- PRIVATE
- Database/AthenaPOOL/AthenaPoolUtilities
- Tools/PathResolver
- External/AtlasCOOL)
-
# External dependencies:
find_package( COOL COMPONENTS CoolKernel)
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/CMakeLists.txt
index 373d758696c4e3974df3c20a585008ceb3815e02..68dd825286a969cbad04998b7857c06c04a1d9d3 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/CMakeLists.txt
@@ -5,34 +5,6 @@
# Declare the package name:
atlas_subdir( MuonCondAlg )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/Identifier
- GaudiKernel
- MuonSpectrometer/MuonAlignment/MuonAlignmentData
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc
- MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibData
- MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibInterfaces
- MuonSpectrometer/MuonCalib/MuonCalibITools
- MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibSvc
- MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils
- MuonSpectrometer/MuonCalib/MuonCalibIdentifier
- MuonSpectrometer/MuonCalib/MuonCalibTools
- MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibMath
- MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl
- PRIVATE
- Event/EventInfo
- MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
- MuonSpectrometer/MuonIdHelpers
- Tools/PathResolver )
-
# External dependencies:
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt
index 305bc7372d86d1686b1b63dc1855edca88dbfa6a..69f08f048253683b313ac682a3730d949d93e456 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt
@@ -5,19 +5,6 @@
# Declare the package name:
atlas_subdir( MuonCondCool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/MinimalRunTime
- Control/StoreGate
- GaudiKernel
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData
- PRIVATE
- Control/AthenaKernel
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc
- MuonSpectrometer/MuonIdHelpers )
-
# Component(s) in the package:
atlas_add_component( MuonCondCool
src/*.cxx
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/CMakeLists.txt
index 3db69fae2d3943ba3b8f2e3e79feedb43b5c72a3..c94eb550d74b5a5f56fc706dd421f3b774fa0781 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/CMakeLists.txt
@@ -5,20 +5,6 @@
# Declare the package name:
atlas_subdir( MuonCondData )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/AthContainers
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- GaudiKernel
- PRIVATE
- Event/EventInfo
- MuonSpectrometer/MuonIdHelpers )
-
-
# Component(s) in the package:
atlas_add_library( MuonCondData
src/*.cxx
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface/CMakeLists.txt
index ad00e28b08f6d2099d5f7609e5bc4f3434d02a83..43b62d8af0aae2d493afd0edaba708fda3c47acc 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface/CMakeLists.txt
@@ -5,14 +5,6 @@
# Declare the package name:
atlas_subdir( MuonCondInterface )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/StoreGate
- DetectorDescription/GeoPrimitives
- GaudiKernel
- MuonSpectrometer/MuonAlignment/MuonAlignmentData )
-
# External dependencies:
find_package( Eigen )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/CMakeLists.txt
index 3d7b2f06647a8ea9f1668f0a98053388b7deff23..cd3210d4d6b98b9e2d223373bd7f14e70ae429cb 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/CMakeLists.txt
@@ -5,19 +5,6 @@
# Declare the package name:
atlas_subdir( MuonCondSvc )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- GaudiKernel
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
- PRIVATE
- MuonSpectrometer/MuonIdHelpers )
-
# External dependencies:
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/CMakeLists.txt
index 648d56904d0b181ada670f7597b48019212501ad..57d51929880a1b861c4068f26ae9e797961fb230 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/CMakeLists.txt
@@ -5,16 +5,6 @@
# Declare the package name:
atlas_subdir( MuonCondTest )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc
- MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
- PRIVATE
- DetectorDescription/Identifier )
-
# External dependencies:
find_package( Eigen )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/CMakeLists.txt
index b0466049d111e2cd156eee6e71ccdcf394c112fd..a12dc9b137b611cebd0ab76c5a1ad37847d2b1c8 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTool/CMakeLists.txt
@@ -5,27 +5,6 @@
# Declare the package name:
atlas_subdir( MuonCondTool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/DetDescrCond/DetDescrConditions
- DetectorDescription/GeoPrimitives
- GaudiKernel
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
- PRIVATE
- Control/SGTools
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/Identifier
- MuonSpectrometer/MuonAlignment/MuonAlignmentData
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc
- MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
- MuonSpectrometer/MuonIdHelpers
- Tools/PathResolver )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( CLHEP )
diff --git a/MuonSpectrometer/MuonConditions/MuonConditionsAthenaPool/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonConditionsAthenaPool/CMakeLists.txt
index f8ab7f12a5e2e7f2b74a7bfa2c2b0c483e6b5d32..8b5017c68d0858ce950f8f4602b0274258c3688b 100644
--- a/MuonSpectrometer/MuonConditions/MuonConditionsAthenaPool/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonConditionsAthenaPool/CMakeLists.txt
@@ -6,18 +6,6 @@
# Declare the package name:
atlas_subdir( MuonConditionsAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthContainers
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- MuonSpectrometer/MuonConditions/MuonByteStreamErrors
- PRIVATE
- GaudiKernel
- AtlasTest/TestTools
- Database/AthenaPOOL/AthenaPoolCnvSvc )
-
# Component(s) in the package:
atlas_add_poolcnv_library( MuonConditionsAthenaPoolPoolCnv src/*.cxx
FILES MuonByteStreamErrors/RpcByteStreamErrorContainer.h