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

Merge branch 'muCmake6' into 'master' 

remove atlas_depends_on_subdirs from MuonCnv packages

See merge request !36152
parents de411bbd e23883de
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!36152remove atlas_depends_on_subdirs from MuonCnv packages
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 172 deletions
MuonSpectrometer/MuonCnv/MuonByteStream/CMakeLists.txt
+ 0
− 23
View file @ cc4dbee5
......@@ -5,29 +5,6 @@
# Declare the package name:
atlas_subdir( MuonByteStream )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
DetectorDescription/IRegionSelector
Database/AthenaPOOL/AthenaPoolUtilities
Event/ByteStreamCnvSvcBase
Event/ByteStreamData
GaudiKernel
MuonSpectrometer/MuonCnv/MuonCSC_CnvTools
MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces
Trigger/TrigEvent/TrigSteeringEvent
PRIVATE
Control/StoreGate
Control/AthViews
Trigger/TrigSteer/ViewAlgs
MuonSpectrometer/MuonCablings/CSCcabling
MuonSpectrometer/MuonCablings/RPCcablingInterface
MuonSpectrometer/MuonCnv/MuonMDT_CnvTools
MuonSpectrometer/MuonCnv/MuonRPC_CnvTools
MuonSpectrometer/MuonIdHelpers
MuonSpectrometer/MuonAlignment/MuonAlignmentData
MuonSpectrometer/MuonRDO )
# External dependencies:
find_package( tdaq-common )
find_package( CLHEP )
......
MuonSpectrometer/MuonCnv/MuonByteStreamCnvTest/CMakeLists.txt
+ 0
− 28
View file @ cc4dbee5
......@@ -5,34 +5,6 @@
# Declare the package name:
atlas_subdir( MuonByteStreamCnvTest )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/StoreGate
GaudiKernel
MuonSpectrometer/MuonCablings/RPCcablingInterface
MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools
MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces
MuonSpectrometer/MuonRDO
Trigger/TrigT1/TrigT1RPChardware
Trigger/TrigT1/TrigT1RPClogic
PRIVATE
Event/EventInfoMgt
MuonSpectrometer/MuonCablings/MuonMDT_Cabling
MuonSpectrometer/MuonCablings/TGCcablingInterface
MuonSpectrometer/MuonCnv/MuonCSC_CnvTools
MuonSpectrometer/MuonCnv/MuonMDT_CnvTools
MuonSpectrometer/MuonCnv/MuonRPC_CnvTools
MuonSpectrometer/MuonCnv/MuonTGC_CnvTools
MuonSpectrometer/MuonCnv/MuonSTGC_CnvTools
MuonSpectrometer/MuonCnv/MuonMM_CnvTools
MuonSpectrometer/MuonDigitContainer
MuonSpectrometer/MuonIdHelpers
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling
MuonSpectrometer/MuonCablings/MuonCablingData )
# Component(s) in the package:
atlas_add_library( MuonByteStreamCnvTestLib
src/*.cxx
......
MuonSpectrometer/MuonCnv/MuonCSC_CnvTools/CMakeLists.txt
+ 0
− 23
View file @ cc4dbee5
......@@ -5,29 +5,6 @@
# Declare the package name:
atlas_subdir( MuonCSC_CnvTools )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Event/ByteStreamData
GaudiKernel
PRIVATE
Control/AthenaBaseComps
Control/AthenaKernel
Control/StoreGate
DetectorDescription/Identifier
Event/ByteStreamCnvSvcBase
Event/EventInfo
Event/EventPrimitives
MuonSpectrometer/MuonCablings/CSCcabling
MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools
MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces
MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
MuonSpectrometer/MuonDigitContainer
MuonSpectrometer/MuonDigitization/MuonDigToolInterfaces
MuonSpectrometer/MuonIdHelpers
MuonSpectrometer/MuonRDO
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
Tracking/TrkDetDescr/TrkSurfaces )
# External dependencies:
find_package( CLHEP )
find_package( tdaq-common COMPONENTS eformat_write DataWriter )
......
MuonSpectrometer/MuonCnv/MuonCnvToolInterfaces/CMakeLists.txt
+ 0
− 9
View file @ cc4dbee5
......@@ -5,15 +5,6 @@
# Declare the package name:
atlas_subdir( MuonCnvToolInterfaces )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
Control/AthContainers
DetectorDescription/Identifier
Event/ByteStreamCnvSvcBase
Event/ByteStreamData
GaudiKernel )
# External dependencies:
find_package( tdaq-common )
find_package( ROOT )
......
MuonSpectrometer/MuonCnv/MuonEventCnvTools/CMakeLists.txt
+ 0
− 17
View file @ cc4dbee5
......@@ -5,23 +5,6 @@
# Declare the package name:
atlas_subdir( MuonEventCnvTools )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Tracking/TrkEventCnv/TrkEventCnvTools
PRIVATE
Control/StoreGate
DetectorDescription/Identifier
Event/EventPrimitives
GaudiKernel
MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
MuonSpectrometer/MuonIdHelpers
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
Tracking/TrkDetDescr/TrkDetElementBase
Tracking/TrkEvent/TrkPrepRawData
Tracking/TrkEvent/TrkRIO_OnTrack )
# Component(s) in the package:
atlas_add_component( MuonEventCnvTools
src/*.cxx
......
MuonSpectrometer/MuonCnv/MuonEventTPCnv/CMakeLists.txt
+ 0
− 48
View file @ cc4dbee5
......@@ -6,54 +6,6 @@
# Declare the package name:
atlas_subdir( MuonEventTPCnv )
# Declare the package's dependencies:
atlas_depends_on_subdirs(
PUBLIC
Control/AthAllocators
Control/AthLinks
Control/DataModelAthenaPool
Database/AthenaPOOL/AthenaPoolCnvSvc
Database/AthenaPOOL/AthenaPoolUtilities
DetectorDescription/Identifier
GaudiKernel
Generators/GeneratorObjectsTPCnv
MuonSpectrometer/MuonDigitContainer
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonChamberT0s
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonCompetingRIOsOnTrack
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonTrigCoinData
MuonSpectrometer/MuonRDO
MuonSpectrometer/MuonSimData
Tracking/TrkDetDescr/TrkSurfaces
Tracking/TrkEvent/TrkRIO_OnTrack
Tracking/TrkEventCnv/TrkEventCnvTools
Tracking/TrkEventCnv/TrkEventTPCnv
PRIVATE
AtlasTest/TestTools
Control/AthenaKernel
Control/StoreGate
Database/TPTools
DetectorDescription/AGDD/AGDDKernel
DetectorDescription/AtlasDetDescr
DetectorDescription/GeoPrimitives
DetectorDescription/IdDict
DetectorDescription/IdDictDetDescr
DetectorDescription/IdDictParser
Event/EventPrimitives
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetDetDescr/InDetReadoutGeometry
InnerDetector/InDetDetDescr/PixelReadoutGeometry
InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
MuonSpectrometer/MuonDetDescr/MuonAGDDDescription
MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
MuonSpectrometer/MuonIdHelpers
Tracking/TrkEvent/TrkEventPrimitives
Tracking/TrkEvent/TrkMeasurementBase
Tracking/TrkEvent/TrkPseudoMeasurementOnTrack )
find_package( GeoModelCore )
# Component(s) in the package:
......
MuonSpectrometer/MuonCnv/MuonIdCnv/CMakeLists.txt
+ 0
− 8
View file @ cc4dbee5
......@@ -5,14 +5,6 @@
# Declare the package name:
atlas_subdir( MuonIdCnv )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PRIVATE
Control/StoreGate
DetectorDescription/DetDescrCnvSvc
DetectorDescription/IdDictDetDescr
GaudiKernel
MuonSpectrometer/MuonIdHelpers )
# Component(s) in the package:
atlas_add_component( MuonIdCnv
src/*.cxx
......
MuonSpectrometer/MuonCnv/MuonJiveXML/CMakeLists.txt
+ 1
− 16
View file @ cc4dbee5
......@@ -5,21 +5,6 @@
# Declare the package name:
atlas_subdir( MuonJiveXML )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
graphics/JiveXML
PRIVATE
GaudiKernel
MuonSpectrometer/MuonCablings/RPCcablingInterface
MuonSpectrometer/MuonCnv/MuonRPC_CnvTools
MuonSpectrometer/MuonIdHelpers
MuonSpectrometer/MuonRDO
MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
MuonSpectrometer/MuonConditions/MuonCondCabling/RPC_CondCabling
PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent )
# External dependencies:
find_package( CLHEP )
......@@ -28,7 +13,7 @@ atlas_add_component( MuonJiveXML
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps MuonReadoutGeometry JiveXMLLib GaudiKernel RPCcablingInterfaceLib MuonIdHelpersLib MuonRDO MuonPrepRawData AnalysisTriggerEvent RPC_CondCablingLib)
LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps MuonRPC_CnvToolsLib MuonReadoutGeometry JiveXMLLib GaudiKernel RPCcablingInterfaceLib MuonIdHelpersLib MuonRDO MuonPrepRawData AnalysisTriggerEvent RPC_CondCablingLib)
# Install files from the package:
atlas_install_headers( MuonJiveXML )
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment