From ea783112c880642a2bd4a8bbeff3a22205c16af0 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 12 Aug 2020 11:28:31 -0400
Subject: [PATCH 1/3] RpcRawDataMonitoring: cmake fixes
Library dependency fixes.
---
.../RpcRawDataMonitoring/CMakeLists.txt | 38 +------------------
1 file changed, 1 insertion(+), 37 deletions(-)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/CMakeLists.txt
index 7027a39ea495..b6dd10ca17ce 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/CMakeLists.txt
@@ -5,42 +5,6 @@
# Declare the package name:
atlas_subdir( RpcRawDataMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaMonitoring
- Control/StoreGate
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigger
- GaudiKernel
- MuonSpectrometer/MuonCablings/MuonRPC_Cabling
- MuonSpectrometer/MuonCablings/RPCcablingInterface
- MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
- MuonSpectrometer/MuonGeoModel
- MuonSpectrometer/MuonRDO
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonTrigCoinData
- MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils
- Reconstruction/MuonIdentification/muonEvent
- Trigger/TrigAnalysis/TrigDecisionTool
- Trigger/TrigT1/TrigT1Interfaces
- PRIVATE
- DetectorDescription/GeoPrimitives
- Event/EventPrimitives
- MuonSpectrometer/MuonDigitContainer
- MuonSpectrometer/MuonIdHelpers
- MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkMeasurementBase
- Tracking/TrkEvent/TrkMultiComponentStateOnSurface
- Tracking/TrkEvent/TrkTrack
- Trigger/TrigConfiguration/TrigConfL1Data
- Trigger/TrigT1/TrigT1Result
- PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces )
-
# External dependencies:
find_package( Eigen )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
@@ -50,7 +14,7 @@ atlas_add_component( RpcRawDataMonitoring
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaMonitoringLib StoreGateLib SGtests xAODEventInfo xAODMuon xAODTrigger xAODTracking GaudiKernel RPCcablingInterfaceLib MuonReadoutGeometry MuonGeoModelLib MuonRDO MuonRIO_OnTrack MuonRPC_CablingLib MuonTrigCoinData MuonDQAUtilsLib muonEvent TrigDecisionToolLib TrigT1Interfaces GeoPrimitives EventPrimitives MuonDigitContainer MuonIdHelpersLib MuonPrepRawData TrkEventPrimitives TrkMeasurementBase TrkMultiComponentStateOnSurface TrkTrack TrigConfL1Data TrigT1Result )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaMonitoringLib StoreGateLib SGtests xAODEventInfo xAODMuon xAODTrigger xAODTracking GaudiKernel RPCcablingInterfaceLib MuonReadoutGeometry MuonGeoModelLib MuonRDO MuonRIO_OnTrack MuonRPC_CablingLib MuonTrigCoinData MuonDQAUtilsLib muonEvent TrigDecisionToolLib TrigT1Interfaces GeoPrimitives EventPrimitives MuonDigitContainer MuonIdHelpersLib MuonPrepRawData TrkEventPrimitives TrkMeasurementBase TrkMultiComponentStateOnSurface TrkTrack TrigConfL1Data TrigT1Result MuonAnalysisInterfacesLib )
# Install files from the package:
atlas_install_headers( RpcRawDataMonitoring )
--
GitLab
From 14c5a38da455e47984c469ae490a79f759ec6675 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 12 Aug 2020 11:42:43 -0400
Subject: [PATCH 2/3] CscRawDataMonitoring: cmake fixes
Library dependency fixes.
---
.../CscRawDataMonitoring/CMakeLists.txt | 27 +------------------
1 file changed, 1 insertion(+), 26 deletions(-)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CMakeLists.txt
index e8228a8dfe40..89c04c7bc83e 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/CMakeLists.txt
@@ -5,31 +5,6 @@
# Declare the package name:
atlas_subdir( CscRawDataMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaMonitoring
- GaudiKernel
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkSegment
- Tracking/TrkEvent/TrkTrack
- Trigger/TrigAnalysis/TrigDecisionTool
- PRIVATE
- Control/StoreGate
- Event/xAOD/xAODEventInfo
- MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools
- MuonSpectrometer/MuonCnv/MuonCSC_CnvTools
- MuonSpectrometer/MuonIdHelpers
- MuonSpectrometer/MuonRDO
- MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
- MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecHelperTools
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkCompetingRIOsOnTrack
- Tracking/TrkEvent/TrkEventPrimitives )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
@@ -38,7 +13,7 @@ atlas_add_component( CscRawDataMonitoring
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib GaudiKernel MuonPrepRawData MuonSegment TrkParameters TrkSegment TrkTrack TrigDecisionToolLib StoreGateLib SGtests xAODEventInfo MuonIdHelpersLib MuonRDO CscClusterizationLib MuonRIO_OnTrack MuonRecHelperToolsLib TrkSurfaces TrkCompetingRIOsOnTrack TrkEventPrimitives )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib GaudiKernel MuonPrepRawData MuonSegment TrkParameters TrkSegment TrkTrack TrigDecisionToolLib StoreGateLib SGtests xAODEventInfo MuonIdHelpersLib MuonRDO CscClusterizationLib MuonRIO_OnTrack MuonRecHelperToolsLib TrkSurfaces TrkCompetingRIOsOnTrack TrkEventPrimitives MuonCSC_CnvToolsLib )
# Install files from the package:
atlas_install_headers( CscRawDataMonitoring )
--
GitLab
From 907f93400480bf2f3945f1dc0fe46913767b8f3c Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 12 Aug 2020 11:52:44 -0400
Subject: [PATCH 3/3] MdtRawDataMonitoring: cmake fixes
Library dependency fixes.
---
.../MdtRawDataMonitoring/CMakeLists.txt | 27 +------------------
1 file changed, 1 insertion(+), 26 deletions(-)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/CMakeLists.txt
index a3157ef0f81f..c1eb2d2b1b8d 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/CMakeLists.txt
@@ -5,31 +5,6 @@
# Declare the package name:
atlas_subdir( MdtRawDataMonitoring )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaMonitoring
- Event/EventInfo
- MuonSpectrometer/MuonIdHelpers
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
- MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils
- Tracking/TrkEvent/TrkSegment
- PRIVATE
- DetectorDescription/Identifier
- DetectorDescription/GeoModel/GeoModelUtilities
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODTrigger
- GaudiKernel
- MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters
- MuonSpectrometer/MuonCalib/MuonCalibIdentifier
- MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonRIO_OnTrack
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonSegment
- PhysicsAnalysis/MuonID/MuonSelectorTools
- PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
- Tools/LWHists
- Tracking/TrkEvent/TrkEventPrimitives )
-
# External dependencies:
find_package( ROOT COMPONENTS Graf Core Tree MathCore Hist RIO pthread Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
@@ -38,7 +13,7 @@ atlas_add_component( MdtRawDataMonitoring
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib EventInfo MuonIdHelpersLib MuonPrepRawData MuonDQAUtilsLib TrkSegment Identifier xAODEventInfo xAODTrigger GaudiKernel MdtCalibFitters MuonCalibIdentifier MuonReadoutGeometry MuonRIO_OnTrack MuonSegment AnalysisTriggerEvent LWHists TrkEventPrimitives GeoModelUtilities )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaMonitoringLib EventInfo MuonIdHelpersLib MuonPrepRawData MuonDQAUtilsLib TrkSegment Identifier xAODEventInfo xAODTrigger GaudiKernel MdtCalibFitters MuonCalibIdentifier MuonReadoutGeometry MuonRIO_OnTrack MuonSegment AnalysisTriggerEvent LWHists TrkEventPrimitives GeoModelUtilities MuonAnalysisInterfacesLib )
# Install files from the package:
atlas_install_headers( MdtRawDataMonitoring )
--
GitLab