From 242d3c64d5c94341e47ffc5b50e8a78dff14d0f8 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Wed, 28 Oct 2020 16:11:08 +0100
Subject: [PATCH] InDetCalibAlgs: cmake cleanup
cmake cleanup, do not install component headers.
---
.../InDetBeamSpotFinder/CMakeLists.txt | 37 +++-------------
.../PixelCalibAlgs/CMakeLists.txt | 43 +++----------------
.../TRT_CalibAlgs/CMakeLists.txt | 38 ++--------------
3 files changed, 14 insertions(+), 104 deletions(-)
diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/CMakeLists.txt b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/CMakeLists.txt
index 5796540349c..21e1504a119 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/CMakeLists.txt
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/CMakeLists.txt
@@ -1,37 +1,11 @@
-################################################################################
-# Package: InDetBeamSpotFinder
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( InDetBeamSpotFinder )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTracking
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/CxxUtils
- Event/EventInfo
- Event/xAOD/xAODEventInfo
- InnerDetector/InDetConditions/BeamSpotConditionsData
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/VxVertex
- Trigger/TrigAnalysis/TrigAnalysisInterfaces
- DetectorDescription/AtlasDetDescr
- DetectorDescription/Identifier
- Tracking/TrkFitter/TrkFitterInterfaces
- Tracking/TrkFitter/TrkFitterUtils
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
- Tracking/TrkEvent/TrkRIO_OnTrack
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkVertexFitter/TrkVertexFitterInterfaces
-)
-
# External dependencies:
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint RooFitCore RooFit )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist Matrix Minuit RooFitCore RooFit )
# Component(s) in the package:
atlas_add_library( InDetBeamSpotFinderLib
@@ -40,13 +14,12 @@ atlas_add_library( InDetBeamSpotFinderLib
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} xAODTracking GaudiKernel TrigAnalysisInterfaces
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps CxxUtils EventInfo xAODEventInfo TrkEventPrimitives VxVertex AtlasDetDescr Identifier TrkFitterInterfaces TrkFitterUtils TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkVertexFitterInterfaces BeamSpotConditionsData )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} BeamSpotConditionsData GaudiKernel TrigAnalysisInterfaces TrkFitterUtils xAODTracking
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps CxxUtils EventInfo xAODEventInfo TrkEventPrimitives VxVertex AtlasDetDescr Identifier StoreGateLib TrkFitterInterfaces TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkVertexFitterInterfaces )
atlas_add_component( InDetBeamSpotFinder
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} xAODTracking GaudiKernel AthenaBaseComps CxxUtils EventInfo xAODEventInfo TrkEventPrimitives VxVertex AtlasDetDescr Identifier TrkFitterInterfaces TrkFitterUtils TrkParameters TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkVertexFitterInterfaces InDetBeamSpotFinderLib BeamSpotConditionsData )
+ LINK_LIBRARIES InDetBeamSpotFinderLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt
index b4e35e65d4e..4a2ec13d2ea 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt
@@ -1,36 +1,9 @@
-################################################################################
-# Package: PixelCalibAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( PixelCalibAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthenaBaseComps
- Control/CxxUtils
- GaudiKernel
- InnerDetector/InDetRecEvent/InDetPrepRawData
- PRIVATE
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/DetDescrCond/DetDescrConditions
- DetectorDescription/Identifier
- Event/EventInfo
- InnerDetector/InDetConditions/InDetConditionsSummaryService
- InnerDetector/InDetConditions/PixelConditionsData
- InnerDetector/InDetDetDescr/PixelCabling
- InnerDetector/InDetConditions/PixelConditionsTools
- InnerDetector/InDetConditions/InDetByteStreamErrors
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/PixelReadoutGeometry
- InnerDetector/InDetDetDescr/PixelGeoModel
- InnerDetector/InDetRawEvent/InDetRawData
- Tools/PathResolver )
-
# External dependencies:
-find_package( CLHEP )
find_package( ROOT COMPONENTS Graf Core Tree MathCore Hist RIO MathMore Physics
Matrix Gpad )
@@ -38,15 +11,11 @@ find_package( ROOT COMPONENTS Graf Core Tree MathCore Hist RIO MathMore Physics
atlas_add_library( PixelCalibAlgsLib
PixelCalibAlgs/*.h src/*.cxx
PUBLIC_HEADERS PixelCalibAlgs
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps CxxUtils
- GaudiKernel InDetPrepRawData InDetConditionsSummaryService PixelCablingLib
- PRIVATE_LINK_LIBRARIES AthenaPoolUtilities
- DetDescrConditions Identifier EventInfo PixelConditionsData InDetIdentifier
- InDetReadoutGeometry PixelReadoutGeometry InDetRawData PathResolver PixelGeoModelLib PixelConditionsToolsLib )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps CxxUtils GaudiKernel InDetConditionsSummaryService
+ InDetPrepRawData InDetReadoutGeometry PixelCablingLib PixelConditionsData StoreGateLib
+ PRIVATE_LINK_LIBRARIES AthenaPoolUtilities EventInfo InDetIdentifier InDetRawData PixelGeoModelLib )
atlas_add_component( PixelCalibAlgs
src/components/*.cxx
- LINK_LIBRARIES GaudiKernel InDetByteStreamErrors PixelConditionsData PixelCalibAlgsLib )
-
+ LINK_LIBRARIES PixelCalibAlgsLib )
diff --git a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/CMakeLists.txt b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/CMakeLists.txt
index 1fbcc828bdc..325bf847826 100644
--- a/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/CMakeLists.txt
+++ b/InnerDetector/InDetCalibAlgs/TRT_CalibAlgs/CMakeLists.txt
@@ -1,49 +1,17 @@
-################################################################################
-# Package: TRT_CalibAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TRT_CalibAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/StoreGate
- Event/xAOD/xAODEventInfo
- GaudiKernel
- InnerDetector/InDetRecTools/TRT_ElectronPidTools
- Tracking/TrkTools/TrkToolInterfaces
- PRIVATE
- Commission/CommissionEvent
- Control/AthContainers
- DetectorDescription/Identifier
- Event/xAOD/xAODTracking
- InnerDetector/InDetCalibEvent/TRT_CalibData
- InnerDetector/InDetCalibTools/TRT_CalibTools
- InnerDetector/InDetConditions/TRT_ConditionsData
- InnerDetector/InDetConditions/TRT_ConditionsServices
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetRawEvent/InDetRawData
- InnerDetector/InDetRecEvent/InDetPrepRawData
- InnerDetector/InDetRecEvent/InDetRIO_OnTrack
- InnerDetector/InDetRecTools/TRT_TrackHoleSearch
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/VxVertex
- Tracking/TrkFitter/TrkFitterInterfaces
- Tracking/TrkExtrapolation/TrkExInterfaces )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint )
+find_package( ROOT COMPONENTS Core )
# Component(s) in the package:
atlas_add_component( TRT_CalibAlgs
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps StoreGateLib SGtests xAODEventInfo GaudiKernel TrkToolInterfaces CommissionEvent AthContainers Identifier xAODTracking TRT_ConditionsData TRT_ConditionsServicesLib InDetIdentifier InDetRawData InDetPrepRawData InDetRIO_OnTrack TrkParameters TrkTrack VxVertex TrkFitterInterfaces TRT_TrackHoleSearchLib TRT_ElectronPidToolsLib TRT_CalibToolsLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel CxxUtils StoreGateLib xAODEventInfo GaudiKernel TrkToolInterfaces CommissionEvent AthContainers Identifier xAODTracking TRT_ConditionsData TRT_ConditionsServicesLib InDetIdentifier InDetRawData InDetPrepRawData InDetRIO_OnTrack TrkParameters TrkTrack VxVertex TrkFitterInterfaces TRT_TrackHoleSearchLib TRT_ElectronPidToolsLib TRT_CalibData TRT_CalibToolsLib )
# Install files from the package:
-atlas_install_headers( TRT_CalibAlgs )
atlas_install_joboptions( share/*.py )
-
--
GitLab