Skip to content
Snippets Groups Projects
Commit 86ae9aba authored by Walter Lampl's avatar Walter Lampl
Browse files

Merge branch 'muCmake9' into 'master'

remove atlas_depends_on_subdirs from MuonDetDescr packages

See merge request atlas/athena!36155
parents 79c907b7 87932b46
No related branches found
No related tags found
No related merge requests found
......@@ -17,22 +17,6 @@ if( NOT SIMULATIONBASE )
set( extra_lib AmdcAthLib )
endif()
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
DetectorDescription/AGDD/AGDDControl
GaudiKernel
PRIVATE
Control/StoreGate
Database/RDBAccessSvc
DetectorDescription/AGDD/AGDD2GeoSvc
DetectorDescription/AGDD/AGDDKernel
DetectorDescription/AGDD/AGDDModel
DetectorDescription/GeoModel/GeoModelInterfaces
MuonSpectrometer/MuonDetDescr/MuonAGDDBase
MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
MuonSpectrometer/MuonDetDescr/MuonDetDescrUtils
${extra_dep} )
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
......
......@@ -5,18 +5,6 @@
# Declare the package name:
atlas_subdir( MuonAGDDBase )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
DetectorDescription/AGDD/AGDDControl
DetectorDescription/AGDD/AGDDKernel
GaudiKernel
MuonSpectrometer/MuonDetDescr/MuonAGDDDescription
PRIVATE
Control/StoreGate
DetectorDescription/AGDD/AGDDModel
DetectorDescription/GeoModel/GeoModelInterfaces
MuonSpectrometer/MuonGeoModel )
find_package( GeoModelCore )
# Component(s) in the package:
......
......@@ -5,12 +5,6 @@
# Declare the package name:
atlas_subdir( MuonAGDDDescription )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
DetectorDescription/AGDD/AGDDKernel
DetectorDescription/AGDD/AGDDModel
)
# Component(s) in the package:
atlas_add_library( MuonAGDDDescription
src/*.cxx
......
......@@ -5,13 +5,6 @@
# Declare the package name:
atlas_subdir( MuonDetDescrUtils )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
MuonSpectrometer/MuonStationIndex
PRIVATE
DetectorDescription/AGDD/AGDDKernel
MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry )
# External dependencies:
find_package( ROOT COMPONENTS RIO Tree Core MathCore Hist pthread )
......
......@@ -6,33 +6,11 @@
atlas_subdir( MuonReadoutGeometry )
# Extra dependencies, based on the environment (no MuonCondSvc needed in AthSimulation):
set( extra_deps )
set( extra_libs )
if( NOT SIMULATIONBASE )
set( extra_deps MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc )
set( extra_libs MuonCondSvcLib )
endif()
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/CxxUtils
Control/AthenaBaseComps
Control/AthenaKernel
DetectorDescription/GeoPrimitives
DetectorDescription/Identifier
GaudiKernel
MuonSpectrometer/MuonAlignment/MuonAlignmentData
MuonSpectrometer/MuonIdHelpers
Tracking/TrkDetDescr/TrkDetElementBase
Tracking/TrkDetDescr/TrkDistortedSurfaces
Tracking/TrkDetDescr/TrkSurfaces
${extra_deps}
PRIVATE
Control/StoreGate
DetectorDescription/AGDD/AGDDModel
DetectorDescription/GeoModel/GeoModelUtilities
MuonSpectrometer/MuonDetDescr/MuonAGDDDescription )
# External dependencies:
find_package( GeoModelCore )
......
......@@ -5,24 +5,6 @@
# Declare the package name:
atlas_subdir( MuonRegionSelector )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/StoreGate
DetectorDescription/GeoPrimitives
DetectorDescription/RegSelLUT
GaudiKernel
MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling
MuonSpectrometer/MuonCablings/RPCcablingInterface
PRIVATE
DetectorDescription/Identifier
DetectorDescription/IRegionSelector
MuonSpectrometer/MuonCablings/MuonCablingData
MuonSpectrometer/MuonCablings/CSCcabling
MuonSpectrometer/MuonCablings/MuonTGC_Cabling
MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
MuonSpectrometer/MuonDetDescr/MuonAGDDDescription )
# External dependencies:
find_package( CLHEP )
find_package( Eigen )
......
......@@ -5,25 +5,6 @@
# Declare the package name:
atlas_subdir( MuonTrackingGeometry )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
AtlasGeometryCommon/SubDetectorEnvelopes
Control/AthenaBaseComps
GaudiKernel
Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv
Tracking/TrkDetDescr/TrkDetDescrInterfaces
Tracking/TrkDetDescr/TrkDetDescrUtils
Tracking/TrkDetDescr/TrkGeometry
Tracking/TrkDetDescr/TrkVolumes
PRIVATE
Control/StoreGate
DetectorDescription/GeoPrimitives
DetectorDescription/GeoModel/GeoModelUtilities
MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
MuonSpectrometer/MuonIdHelpers
Tracking/TrkDetDescr/TrkGeometrySurfaces
Tracking/TrkDetDescr/TrkSurfaces )
# External dependencies:
find_package( Eigen )
find_package( GeoModelCore )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment