From 5e3fe6eb42d17de9680d07fbd5222347ffb0124f Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Mon, 19 Oct 2020 17:47:58 +0200
Subject: [PATCH] TrkDetDescr: cmake cleanup
Remove `atlas_depends_on_subdirs`, fix link dependencies and remove
unused externals.
---
.../TrkAlignableSurfaces/CMakeLists.txt | 17 +--
.../TrkDetDescrAlgs/CMakeLists.txt | 24 +---
.../TrkDetDescrAthenaPool/CMakeLists.txt | 12 +-
.../TrkDetDescrExample/CMakeLists.txt | 4 +-
.../TrkDetDescrGeoModelCnv/CMakeLists.txt | 19 +--
.../TrkDetDescrInterfaces/CMakeLists.txt | 24 +---
.../TrkDetDescr/TrkDetDescrSvc/CMakeLists.txt | 30 +----
.../TrkDetDescrTPCnv/CMakeLists.txt | 110 ++++--------------
.../TrkDetDescrTestTools/CMakeLists.txt | 28 +----
.../TrkDetDescrUnitTests/CMakeLists.txt | 31 +----
.../TrkDetDescrUtils/CMakeLists.txt | 19 +--
.../TrkDetElementBase/CMakeLists.txt | 16 +--
.../TrkDistortedSurfaces/CMakeLists.txt | 26 +----
.../TrkDetDescr/TrkGeometry/CMakeLists.txt | 35 +-----
.../TrkGeometrySurfaces/CMakeLists.txt | 21 +---
.../TrkDetDescr/TrkSurfaces/CMakeLists.txt | 32 +----
.../TrkDetDescr/TrkVolumes/CMakeLists.txt | 23 +---
17 files changed, 67 insertions(+), 404 deletions(-)
diff --git a/Tracking/TrkDetDescr/TrkAlignableSurfaces/CMakeLists.txt b/Tracking/TrkDetDescr/TrkAlignableSurfaces/CMakeLists.txt
index 8728cd939fd0..cefbccdddfe1 100644
--- a/Tracking/TrkDetDescr/TrkAlignableSurfaces/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkAlignableSurfaces/CMakeLists.txt
@@ -1,23 +1,10 @@
-################################################################################
-# Package: TrkAlignableSurfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkAlignableSurfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/GeoPrimitives
- DetectorDescription/Identifier
- Tracking/TrkDetDescr/TrkSurfaces )
-
-# External dependencies:
-find_package( Eigen )
-
# Component(s) in the package:
atlas_add_library( TrkAlignableSurfaces
src/*.cxx
PUBLIC_HEADERS TrkAlignableSurfaces
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives Identifier TrkSurfaces )
-
+ LINK_LIBRARIES GeoPrimitives Identifier TrkSurfaces )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrAlgs/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDetDescrAlgs/CMakeLists.txt
index 5fde413840f5..05f41201d75f 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrAlgs/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDetDescrAlgs/CMakeLists.txt
@@ -1,35 +1,17 @@
-################################################################################
-# Package: TrkDetDescrAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkDetDescrAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrUtils
- PRIVATE
- Tracking/TrkDetDescr/TrkDetDescrInterfaces
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkVolumes
- Tracking/TrkEvent/TrkNeutralParameters
- Tracking/TrkExtrapolation/TrkExInterfaces )
-
# External dependencies:
-find_package( Eigen )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-# tag use_trkdetdescr_memmon was not recognized in automatic conversion in cmt2cmake
-
# Component(s) in the package:
atlas_add_component( TrkDetDescrAlgs
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel TrkDetDescrUtils TrkDetDescrInterfaces TrkGeometry TrkVolumes TrkNeutralParameters TrkExInterfaces )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel StoreGateLib TrkDetDescrUtils TrkDetDescrInterfaces TrkGeometry TrkVolumes TrkNeutralParameters TrkExInterfaces )
# Install files from the package:
atlas_install_headers( TrkDetDescrAlgs )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/CMakeLists.txt
index 5c8aedafb861..d9a21d837b64 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDetDescrAthenaPool/CMakeLists.txt
@@ -1,18 +1,8 @@
-################################################################################
-# Package: TrkDetDescrAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkDetDescrAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrTPCnv
- Tracking/TrkDetDescr/TrkGeometry )
-
# Component(s) in the package:
atlas_add_poolcnv_library( TrkDetDescrAthenaPoolPoolCnv
src/*.cxx
diff --git a/Tracking/TrkDetDescr/TrkDetDescrExample/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDetDescrExample/CMakeLists.txt
index 53d1a943d153..8c2cc24b80f9 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrExample/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDetDescrExample/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: TrkDetDescrExample
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkDetDescrExample )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv/CMakeLists.txt
index 67bf56dde283..bb7744e9d9ca 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDetDescrGeoModelCnv/CMakeLists.txt
@@ -1,28 +1,15 @@
-################################################################################
-# Package: TrkDetDescrGeoModelCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkDetDescrGeoModelCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/GeoPrimitives
- Tracking/TrkDetDescr/TrkGeometry
- PRIVATE
- Tracking/TrkDetDescr/TrkVolumes )
-
# External dependencies:
-find_package( CLHEP )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( TrkDetDescrGeoModelCnv
src/*.cxx
PUBLIC_HEADERS TrkDetDescrGeoModelCnv
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives TrkGeometry
- PRIVATE_LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} TrkVolumes )
-
+ LINK_LIBRARIES GeoPrimitives TrkGeometry
+ PRIVATE_LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} GaudiKernel TrkVolumes )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrInterfaces/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDetDescrInterfaces/CMakeLists.txt
index 7c8798897a6f..dc8dfd9a5a59 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrInterfaces/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDetDescrInterfaces/CMakeLists.txt
@@ -1,29 +1,9 @@
-################################################################################
-# Package: TrkDetDescrInterfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkDetDescrInterfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkDetDescr/TrkVolumes
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkMaterialOnTrack
- Tracking/TrkEvent/TrkParameters )
-
-# External dependencies:
-find_package( Eigen )
-
# Component(s) in the package:
atlas_add_library( TrkDetDescrInterfaces
PUBLIC_HEADERS TrkDetDescrInterfaces
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaKernel GeoPrimitives GaudiKernel TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes TrkEventPrimitives TrkMaterialOnTrack TrkParameters )
-
+ LINK_LIBRARIES AthenaKernel CxxUtils GeoPrimitives GaudiKernel TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes TrkEventPrimitives TrkMaterialOnTrack TrkParameters )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDetDescrSvc/CMakeLists.txt
index ccef88c661d0..6e11813894cf 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/CMakeLists.txt
@@ -1,38 +1,18 @@
-################################################################################
-# Package: TrkDetDescrSvc
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkDetDescrSvc )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrInterfaces
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometry
- PRIVATE
- Control/StoreGate
- Event/EventInfo
- Tracking/TrkDetDescr/TrkVolumes )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( TrkDetDescrSvcLib
src/*.cxx
PUBLIC_HEADERS TrkDetDescrSvc
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TrkDetDescrInterfaces TrkDetDescrUtils TrkGeometry StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES EventInfo TrkVolumes )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel TrkDetDescrInterfaces TrkDetDescrUtils TrkGeometry TrkVolumes
+ PRIVATE_LINK_LIBRARIES EventInfo StoreGateLib )
atlas_add_component( TrkDetDescrSvc
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TrkDetDescrInterfaces TrkDetDescrUtils TrkGeometry StoreGateLib SGtests EventInfo TrkVolumes TrkDetDescrSvcLib )
+ LINK_LIBRARIES TrkDetDescrSvcLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTPCnv/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDetDescrTPCnv/CMakeLists.txt
index f44f4837f63a..acc556ed0171 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrTPCnv/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDetDescrTPCnv/CMakeLists.txt
@@ -1,102 +1,36 @@
-################################################################################
-# Package: TrkDetDescrTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkDetDescrTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometry
- PRIVATE
- AtlasTest/TestTools
- GaudiKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( TrkDetDescrTPCnv
src/*.cxx
src/TrkDetDescrUtils/*.cxx
src/TrkGeometry/*.cxx
PUBLIC_HEADERS TrkDetDescrTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaPoolUtilities TrkDetDescrUtils TrkGeometry AthenaPoolCnvSvcLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools GaudiKernel )
+ LINK_LIBRARIES AthenaPoolUtilities TrkDetDescrUtils TrkGeometry AthenaPoolCnvSvcLib )
atlas_add_dictionary( TrkDetDescrTPCnvDict
TrkDetDescrTPCnv/TrkDetDescrTPCnvDict.h
TrkDetDescrTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrkDetDescrUtils TrkGeometry TestTools GaudiKernel TrkDetDescrTPCnv )
-
-atlas_add_test( BinnedLayerMaterialCnv_p1_test
- SOURCES
- test/BinnedLayerMaterialCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrkDetDescrUtils TrkGeometry TestTools GaudiKernel TrkDetDescrTPCnv )
-
-atlas_add_test( BinUtilityCnv_p1_test
- SOURCES
- test/BinUtilityCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrkDetDescrUtils TrkGeometry TestTools GaudiKernel TrkDetDescrTPCnv )
-
-atlas_add_test( CompressedLayerMaterialCnv_p1_test
- SOURCES
- test/CompressedLayerMaterialCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrkDetDescrUtils TrkGeometry TestTools GaudiKernel TrkDetDescrTPCnv )
-
-atlas_add_test( CompoundLayerMaterialCnv_p1_test
- SOURCES
- test/CompoundLayerMaterialCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrkDetDescrUtils TrkGeometry TestTools GaudiKernel TrkDetDescrTPCnv )
-
-atlas_add_test( ElementTableCnv_p1_test
- SOURCES
- test/ElementTableCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrkDetDescrUtils TrkGeometry TestTools GaudiKernel TrkDetDescrTPCnv )
-
-atlas_add_test( HomogeneousLayerMaterialCnv_p1_test
- SOURCES
- test/HomogeneousLayerMaterialCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrkDetDescrUtils TrkGeometry TestTools GaudiKernel TrkDetDescrTPCnv )
-
-atlas_add_test( LayerMaterialMapCnv_p1_test
- SOURCES
- test/LayerMaterialMapCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrkDetDescrUtils TrkGeometry TestTools GaudiKernel TrkDetDescrTPCnv )
-
-atlas_add_test( MaterialCnv_p1_test
- SOURCES
- test/MaterialCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrkDetDescrUtils TrkGeometry TestTools GaudiKernel TrkDetDescrTPCnv )
-
-atlas_add_test( MaterialPropertiesCnv_p1_test
- SOURCES
- test/MaterialPropertiesCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrkDetDescrUtils TrkGeometry TestTools GaudiKernel TrkDetDescrTPCnv )
-
-atlas_add_test( MaterialStepCnv_p1_test
- SOURCES
- test/MaterialStepCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrkDetDescrUtils TrkGeometry TestTools GaudiKernel TrkDetDescrTPCnv )
-
-atlas_add_test( MaterialStepCollectionCnv_p1_test
- SOURCES
- test/MaterialStepCollectionCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities TrkDetDescrUtils TrkGeometry TestTools GaudiKernel TrkDetDescrTPCnv )
-
+ LINK_LIBRARIES TrkDetDescrTPCnv )
+
+# Tests in the package:
+function( _add_test name )
+ atlas_add_test( ${name}
+ SOURCES test/${name}.cxx
+ LINK_LIBRARIES GaudiKernel TestTools TrkDetDescrTPCnv )
+endfunction( _add_test )
+
+_add_test( BinnedLayerMaterialCnv_p1_test )
+_add_test( BinUtilityCnv_p1_test )
+_add_test( CompressedLayerMaterialCnv_p1_test )
+_add_test( CompoundLayerMaterialCnv_p1_test )
+_add_test( ElementTableCnv_p1_test )
+_add_test( HomogeneousLayerMaterialCnv_p1_test )
+_add_test( LayerMaterialMapCnv_p1_test )
+_add_test( MaterialCnv_p1_test )
+_add_test( MaterialPropertiesCnv_p1_test )
+_add_test( MaterialStepCnv_p1_test )
+_add_test( MaterialStepCollectionCnv_p1_test )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTestTools/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDetDescrTestTools/CMakeLists.txt
index 9b700306b610..897168dfe03e 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrTestTools/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDetDescrTestTools/CMakeLists.txt
@@ -1,36 +1,14 @@
-################################################################################
-# Package: TrkDetDescrTestTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkDetDescrTestTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrInterfaces
- PRIVATE
- Event/EventPrimitives
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkDetDescr/TrkVolumes
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkUtilityPackages/TrkValidationUtils )
-
# External dependencies:
-find_package( Eigen )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_component( TrkDetDescrTestTools
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel TrkDetDescrInterfaces EventPrimitives TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes TrkEventPrimitives TrkValidationUtils )
-
-# Install files from the package:
-atlas_install_headers( TrkDetDescrTestTools )
-
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel TrkDetDescrInterfaces EventPrimitives TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes TrkEventPrimitives TrkValidationUtils )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrUnitTests/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDetDescrUnitTests/CMakeLists.txt
index 694bb11db1ef..1c5402f018a7 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrUnitTests/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDetDescrUnitTests/CMakeLists.txt
@@ -1,37 +1,14 @@
-################################################################################
-# Package: TrkDetDescrUnitTests
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkDetDescrUnitTests )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrInterfaces
- PRIVATE
- DetectorDescription/GeoPrimitives
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkDetDescr/TrkVolumes
- Tracking/TrkEvent/TrkNeutralParameters
- Tracking/TrkUtilityPackages/TrkValidationUtils )
-
# External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-# tag use_new_tracking_edm was not recognized in automatic conversion in cmt2cmake
+find_package( ROOT COMPONENTS Core Tree )
# Component(s) in the package:
atlas_add_component( TrkDetDescrUnitTests
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GaudiKernel TrkDetDescrInterfaces GeoPrimitives TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes TrkNeutralParameters TrkValidationUtils )
-
-# Install files from the package:
-atlas_install_headers( TrkDetDescrUnitTests )
-
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel TrkDetDescrInterfaces GeoPrimitives TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes TrkNeutralParameters TrkValidationUtils )
diff --git a/Tracking/TrkDetDescr/TrkDetDescrUtils/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDetDescrUtils/CMakeLists.txt
index 7de52390b157..45902c53ba90 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrUtils/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDetDescrUtils/CMakeLists.txt
@@ -1,25 +1,10 @@
-################################################################################
-# Package: TrkDetDescrUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkDetDescrUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tracking/TrkEvent/TrkEventPrimitives
- Control/CxxUtils)
-
-# External dependencies:
-find_package( Eigen )
-
# Component(s) in the package:
atlas_add_library( TrkDetDescrUtils
src/*.cxx
PUBLIC_HEADERS TrkDetDescrUtils
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaKernel GeoPrimitives GaudiKernel TrkEventPrimitives CxxUtils)
-
+ LINK_LIBRARIES AthenaKernel GeoPrimitives GaudiKernel TrkEventPrimitives CxxUtils)
diff --git a/Tracking/TrkDetDescr/TrkDetElementBase/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDetElementBase/CMakeLists.txt
index cc8087f5df16..b25b4c14c835 100644
--- a/Tracking/TrkDetDescr/TrkDetElementBase/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDetElementBase/CMakeLists.txt
@@ -1,24 +1,14 @@
-################################################################################
-# Package: TrkDetElementBase
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkDetElementBase )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/GeoPrimitives
- DetectorDescription/Identifier
- Event/EventPrimitives )
-
# External dependencies:
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( TrkDetElementBase
src/*.cxx
PUBLIC_HEADERS TrkDetElementBase
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} GeoPrimitives Identifier EventPrimitives )
-
+ INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} GeoPrimitives Identifier EventPrimitives )
diff --git a/Tracking/TrkDetDescr/TrkDistortedSurfaces/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDistortedSurfaces/CMakeLists.txt
index eb427105f8b5..7303363cea7f 100644
--- a/Tracking/TrkDetDescr/TrkDistortedSurfaces/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDistortedSurfaces/CMakeLists.txt
@@ -1,34 +1,16 @@
-################################################################################
-# Package: TrkDistortedSurfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkDistortedSurfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkSurfaces
- PRIVATE
- Tracking/TrkEvent/TrkEventPrimitives )
-
-# External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( TrkDistortedSurfaces
src/*.cxx
PUBLIC_HEADERS TrkDistortedSurfaces
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives GaudiKernel TrkSurfaces
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TrkEventPrimitives )
+ LINK_LIBRARIES GeoPrimitives GaudiKernel TrkSurfaces
+ PRIVATE_LINK_LIBRARIES TrkEventPrimitives )
atlas_add_dictionary( TrkDistortedSurfacesDict
TrkDistortedSurfaces/TrkDistortedSurfacesDict.h
TrkDistortedSurfaces/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} GeoPrimitives GaudiKernel TrkSurfaces TrkEventPrimitives TrkDistortedSurfaces )
-
+ LINK_LIBRARIES TrkDistortedSurfaces )
diff --git a/Tracking/TrkDetDescr/TrkGeometry/CMakeLists.txt b/Tracking/TrkDetDescr/TrkGeometry/CMakeLists.txt
index 5fca33de8b83..2175d2c31197 100644
--- a/Tracking/TrkDetDescr/TrkGeometry/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkGeometry/CMakeLists.txt
@@ -1,43 +1,16 @@
-################################################################################
-# Package: TrkGeometry
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkGeometry )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/AthContainers
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometrySurfaces
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkDetDescr/TrkVolumes
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkNeutralParameters
- Tracking/TrkEvent/TrkParameters
- PRIVATE
- Event/EventPrimitives )
-
-# External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( TrkGeometry
src/*.cxx
PUBLIC_HEADERS TrkGeometry
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel AthContainers GeoPrimitives GaudiKernel TrkDetDescrUtils TrkGeometrySurfaces TrkSurfaces TrkVolumes TrkEventPrimitives TrkNeutralParameters TrkParameters
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} EventPrimitives )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel AthContainers CxxUtils GeoPrimitives GaudiKernel TrkDetDescrUtils TrkGeometrySurfaces TrkSurfaces TrkVolumes TrkEventPrimitives TrkNeutralParameters TrkParameters
+ PRIVATE_LINK_LIBRARIES EventPrimitives )
atlas_add_dictionary( TrkGeometryDict
TrkGeometry/TrkGeometryDict.h
TrkGeometry/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel AthContainers GeoPrimitives GaudiKernel TrkDetDescrUtils TrkGeometrySurfaces TrkSurfaces TrkVolumes TrkEventPrimitives TrkNeutralParameters TrkParameters EventPrimitives TrkGeometry )
-
+ LINK_LIBRARIES AthContainers TrkGeometry )
diff --git a/Tracking/TrkDetDescr/TrkGeometrySurfaces/CMakeLists.txt b/Tracking/TrkDetDescr/TrkGeometrySurfaces/CMakeLists.txt
index b0c79b657b99..71b3d32e8dfb 100644
--- a/Tracking/TrkDetDescr/TrkGeometrySurfaces/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkGeometrySurfaces/CMakeLists.txt
@@ -1,29 +1,12 @@
-################################################################################
-# Package: TrkGeometrySurfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkGeometrySurfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/GeoPrimitives
- Event/EventPrimitives
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkParametersBase
- PRIVATE
- GaudiKernel )
-
-# External dependencies:
-find_package( Eigen )
-
# Component(s) in the package:
atlas_add_library( TrkGeometrySurfaces
src/*.cxx
PUBLIC_HEADERS TrkGeometrySurfaces
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives EventPrimitives TrkDetDescrUtils TrkSurfaces TrkEventPrimitives TrkParametersBase
+ LINK_LIBRARIES GeoPrimitives EventPrimitives TrkDetDescrUtils TrkSurfaces TrkEventPrimitives TrkParametersBase
PRIVATE_LINK_LIBRARIES GaudiKernel )
diff --git a/Tracking/TrkDetDescr/TrkSurfaces/CMakeLists.txt b/Tracking/TrkDetDescr/TrkSurfaces/CMakeLists.txt
index 37a4bfb21b5f..c6bb97745737 100644
--- a/Tracking/TrkDetDescr/TrkSurfaces/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkSurfaces/CMakeLists.txt
@@ -1,44 +1,20 @@
-# $Id: CMakeLists.txt 746161 2016-05-11 12:24:58Z krasznaa $
-################################################################################
-# Package: TrkSurfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkSurfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthenaKernel
- Control/AthContainers
- DetectorDescription/GeoPrimitives
- DetectorDescription/Identifier
- Event/EventPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkDetElementBase
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkParametersBase
- PRIVATE
- AtlasTest/TestTools
- Control/CxxUtils )
-
# Component(s) in the package:
atlas_add_library( TrkSurfaces
TrkSurfaces/*.h src/*.cxx
PUBLIC_HEADERS TrkSurfaces
- LINK_LIBRARIES AthenaKernel AthContainers GeoPrimitives Identifier EventPrimitives TrkParametersBase
- GaudiKernel TrkDetDescrUtils TrkDetElementBase TrkEventPrimitives
- PRIVATE_LINK_LIBRARIES CxxUtils )
+ LINK_LIBRARIES AthenaKernel AthContainers CxxUtils GeoPrimitives Identifier EventPrimitives TrkParametersBase
+ GaudiKernel TrkDetDescrUtils TrkDetElementBase TrkEventPrimitives )
atlas_add_dictionary( TrkSurfacesDict
TrkSurfaces/TrkSurfacesDict.h
TrkSurfaces/selection.xml
LINK_LIBRARIES TrkSurfaces )
-
atlas_add_test( CylinderSurface_test
SOURCES test/CylinderSurface_test.cxx
- LINK_LIBRARIES TrkSurfaces TestTools )
-
-
+ LINK_LIBRARIES TrkEventPrimitives TrkSurfaces TestTools )
diff --git a/Tracking/TrkDetDescr/TrkVolumes/CMakeLists.txt b/Tracking/TrkDetDescr/TrkVolumes/CMakeLists.txt
index c9bd2596edb4..7b3c57da2c72 100644
--- a/Tracking/TrkDetDescr/TrkVolumes/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkVolumes/CMakeLists.txt
@@ -1,29 +1,10 @@
-################################################################################
-# Package: TrkVolumes
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkVolumes )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometrySurfaces
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkParameters
- Control/CxxUtils)
-
-# External dependencies:
-find_package( Eigen )
-
# Component(s) in the package:
atlas_add_library( TrkVolumes
src/*.cxx
PUBLIC_HEADERS TrkVolumes
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaKernel GeoPrimitives GaudiKernel TrkDetDescrUtils TrkGeometrySurfaces TrkSurfaces TrkEventPrimitives TrkParameters CxxUtils)
-
+ LINK_LIBRARIES AthenaKernel GeoPrimitives GaudiKernel TrkDetDescrUtils TrkGeometrySurfaces TrkSurfaces TrkEventPrimitives TrkParameters CxxUtils)
--
GitLab