diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExAlgs/CMakeLists.txt
index d93a99657fb0dd0309d67258a9a549e052c5eb2d..14aa0064ff56ebd26ed849bede186ab13c8b9203 100644
--- a/Tracking/TrkExtrapolation/TrkExAlgs/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExAlgs/CMakeLists.txt
@@ -1,47 +1,19 @@
-################################################################################
-# Package: TrkExAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkExAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthContainers
- DetectorDescription/GeoPrimitives
- Event/EventPrimitives
- GaudiKernel
- MagneticField/MagFieldInterfaces
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkParameters
- PRIVATE
- Control/StoreGate
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkVolumes
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkExtrapolation/TrkExUtils
- ActsGeometryInterfaces
- ActsGeometry
- ActsInterop)
-
# External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( CLHEP )
+find_package( ROOT COMPONENTS Core Tree RIO )
find_package( Acts COMPONENTS Core )
-
# Component(s) in the package:
atlas_add_component( TrkExAlgs
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthContainers GeoPrimitives EventPrimitives GaudiKernel MagFieldInterfaces TrkSurfaces TrkParameters StoreGateLib SGtests TrkGeometry TrkVolumes TrkEventPrimitives TrkTrack TrkExInterfaces TrkExUtils ActsGeometryInterfacesLib ActsInteropLib ActsGeometryLib ActsCore)
-
-atlas_install_python_modules( python/*.py )
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthenaBaseComps AthenaKernel AthContainers GeoPrimitives EventPrimitives GaudiKernel MagFieldInterfaces TrkSurfaces TrkParameters TrkParametersBase TrkGeometry TrkVolumes TrkEventPrimitives TrkTrack TrkExInterfaces TrkExUtils ActsGeometryInterfacesLib ActsInteropLib ActsGeometryLib ActsCore)
# Install files from the package:
-atlas_install_headers( TrkExAlgs )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Tracking/TrkExtrapolation/TrkExEngine/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExEngine/CMakeLists.txt
index 054d1e7e78888d8bad88ab727c813dc8a60a3f1e..28e4e1fc262f2f6c5c9b34500979b6c596f475fc 100644
--- a/Tracking/TrkExtrapolation/TrkExEngine/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExEngine/CMakeLists.txt
@@ -1,38 +1,13 @@
-################################################################################
-# Package: TrkExEngine
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkExEngine )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrInterfaces
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkDetDescr/TrkVolumes
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkNeutralParameters
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkExtrapolation/TrkExUtils
- PRIVATE
- Tracking/TrkDetDescr/TrkDetDescrUtils )
-
-# External dependencies:
-find_package( Eigen )
-
# Component(s) in the package:
atlas_add_component( TrkExEngine
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel TrkDetDescrInterfaces TrkGeometry TrkSurfaces TrkVolumes TrkEventPrimitives TrkNeutralParameters TrkParameters TrkExInterfaces TrkExUtils TrkDetDescrUtils )
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel TrkDetDescrInterfaces TrkGeometry TrkSurfaces TrkVolumes TrkEventPrimitives TrkNeutralParameters TrkParameters TrkExInterfaces TrkExUtils TrkDetDescrUtils )
# Install files from the package:
-atlas_install_headers( TrkExEngine )
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Tracking/TrkExtrapolation/TrkExExample/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExExample/CMakeLists.txt
index 1ff7ecd1f2a689128ed6aff9679b078138701397..141ac8de5d41ac55f1662ff01d6bee57c6616ffb 100644
--- a/Tracking/TrkExtrapolation/TrkExExample/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExExample/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: TrkExExample
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkExExample )
diff --git a/Tracking/TrkExtrapolation/TrkExInterfaces/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExInterfaces/CMakeLists.txt
index fbe4584007be271d8f82fdba90c7af5e614514a1..b9ab5ae8ea22c3d6d318144269934b57409e8cd4 100644
--- a/Tracking/TrkExtrapolation/TrkExInterfaces/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExInterfaces/CMakeLists.txt
@@ -1,31 +1,9 @@
-################################################################################
-# Package: TrkExInterfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkExInterfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/GeoPrimitives
- Event/xAOD/xAODTracking
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkDetDescr/TrkVolumes
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkMaterialOnTrack
- Tracking/TrkEvent/TrkNeutralParameters
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkParametersBase
- Tracking/TrkExtrapolation/TrkExUtils )
-
-# External dependencies:
-find_package( Eigen )
-
# Component(s) in the package:
atlas_add_library( TrkExInterfaces
PUBLIC_HEADERS TrkExInterfaces
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives xAODTracking GaudiKernel TrkDetDescrUtils TrkSurfaces TrkVolumes TrkEventPrimitives TrkMaterialOnTrack TrkNeutralParameters TrkParameters TrkParametersBase TrkExUtils )
-
+ LINK_LIBRARIES GeoPrimitives xAODTracking GaudiKernel TrkDetDescrUtils TrkSurfaces TrkVolumes TrkEventPrimitives TrkMaterialOnTrack TrkNeutralParameters TrkParameters TrkParametersBase TrkExUtils )
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/CMakeLists.txt
index 215905a6a66c8d4dfb854ebb0b7f71967e0fa5b6..2c122fbbff4b5b99e0482c79db5201d089d9ed93 100644
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/CMakeLists.txt
@@ -1,50 +1,23 @@
-################################################################################
-# Package: TrkExRungeKuttaIntersector
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkExRungeKuttaIntersector )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/GeoPrimitives
- Event/EventPrimitives
- GaudiKernel
- MagneticField/MagFieldConditions
- MagneticField/MagFieldElements
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkExtrapolation/TrkExUtils
- PRIVATE
- Control/CxxUtils
- AtlasTest/TestTools
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkParameters
- Tools/PathResolver )
-
# External dependencies:
-find_package( Eigen )
-find_package( ROOT )
-
+find_package( ROOT COMPONENTS Core Tree RIO )
# Component(s) in the package:
atlas_add_component( TrkExRungeKuttaIntersector
src/IntersectorWrapper.cxx
src/RungeKuttaIntersector.cxx
src/components/*.cxx
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives EventPrimitives GaudiKernel MagFieldConditions MagFieldElements TrkExInterfaces TrkExUtils TrkDetDescrUtils TrkGeometry TrkSurfaces TrkParameters TrkExInterfaces )
-
-# Install files from the package:
-atlas_install_headers( TrkExRungeKuttaIntersector )
-
+ LINK_LIBRARIES AthenaBaseComps GeoPrimitives EventPrimitives GaudiKernel MagFieldConditions StoreGateLib TrkExInterfaces TrkExUtils TrkDetDescrUtils TrkGeometry TrkSurfaces TrkParameters TrkExInterfaces )
+# Tests in the package:
atlas_add_test( RungeKuttaIntersector_test
SOURCES test/RungeKuttaIntersector_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES TrkExUtils GaudiKernel TestTools PathResolver CxxUtils ${ROOT_LIBRARIES} MagFieldElements MagFieldConditions TrkExInterfaces
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel MagFieldConditions PathResolver SGTools StoreGateLib TestTools TrkExInterfaces
PROPERTIES TIMEOUT 300
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/CMakeLists.txt
index 7fe2c64234de4fb447bf330f3aa333a91fc3c692..5ce2d77bfc8bf3acea00abc1b22ba16bf24f7db0 100644
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/CMakeLists.txt
@@ -1,36 +1,12 @@
-################################################################################
-# Package: TrkExRungeKuttaPropagator
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkExRungeKuttaPropagator )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkNeutralParameters
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkExtrapolation/TrkExInterfaces
- PRIVATE
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkPatternParameters
- Tracking/TrkExtrapolation/TrkExUtils
- MagneticField/MagFieldElements
- MagneticField/MagFieldConditions
- Control/CxxUtils
- )
-
# Component(s) in the package:
atlas_add_component( TrkExRungeKuttaPropagator
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel MagFieldInterfaces TrkEventPrimitives TrkNeutralParameters
- TrkParameters TrkExInterfaces TrkGeometry TrkSurfaces TrkPatternParameters TrkExUtils MagFieldElements MagFieldConditions
- CxxUtils)
-
-# Install files from the package:
-atlas_install_headers( TrkExRungeKuttaPropagator )
-
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel TrkEventPrimitives TrkNeutralParameters
+ TrkParameters TrkExInterfaces TrkGeometry TrkSurfaces TrkPatternParameters TrkExUtils
+ MagFieldElements MagFieldConditions CxxUtils )
diff --git a/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/CMakeLists.txt
index 28aeac96cc740f5841a9c121f7bf8fda584f9739..31ca5c8e3f9fb7a560fd750e52db5d3ab3a35824 100644
--- a/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExSTEP_Propagator/CMakeLists.txt
@@ -1,45 +1,16 @@
-################################################################################
-# Package: TrkExSTEP_Propagator
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkExSTEP_Propagator )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- DetectorDescription/GeoPrimitives
- Event/EventPrimitives
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkMaterialOnTrack
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkExtrapolation/TrkExUtils
- PRIVATE
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkTrack
- MagneticField/MagFieldElements
- MagneticField/MagFieldConditions
- Control/CxxUtils
- )
-
# External dependencies:
find_package( CLHEP )
-find_package( Eigen )
# Component(s) in the package:
atlas_add_component( TrkExSTEP_Propagator
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives EventPrimitives TrkGeometry TrkEventPrimitives
- TrkMaterialOnTrack TrkParameters TrkExInterfaces TrkExUtils GaudiKernel TrkDetDescrUtils TrkSurfaces TrkTrack
- MagFieldElements MagFieldConditions CxxUtils)
-
-# Install files from the package:
-atlas_install_headers( TrkExSTEP_Propagator )
-
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives EventPrimitives TrkGeometry TrkEventPrimitives
+ TrkMaterialOnTrack TrkParameters TrkExInterfaces TrkExUtils GaudiKernel TrkDetDescrUtils TrkSurfaces TrkTrack
+ MagFieldElements MagFieldConditions CxxUtils)
diff --git a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/CMakeLists.txt
index 36bf7a32f8c592498079a61b99d218aff87901b2..4688597037e71eca9c1191e05a7c2ffbc5ab0c34 100644
--- a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/CMakeLists.txt
@@ -1,28 +1,9 @@
-################################################################################
-# Package: TrkExSolenoidalIntersector
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkExSolenoidalIntersector )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/GeoPrimitives
- GaudiKernel
- MagneticField/MagFieldConditions
- MagneticField/MagFieldElements
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkExtrapolation/TrkExUtils
- PRIVATE
- Control/CxxUtils
- Event/EventPrimitives
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkParameters
- Tools/PathResolver )
-
# External dependencies:
-find_package( Eigen )
find_package( ROOT )
atlas_add_library( TrkExSolenoidalIntersectorLib
@@ -30,26 +11,25 @@ atlas_add_library( TrkExSolenoidalIntersectorLib
src/SolenoidParametrization.cxx
src/SolenoidParametrizationCondAlg.cxx
PUBLIC_HEADERS TrkExSolenoidalIntersector
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel MagFieldElements MagFieldConditions TrkExInterfaces TrkExUtils EventPrimitives TrkSurfaces TrkParameters )
-
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel CxxUtils GeoPrimitives GaudiKernel MagFieldConditions StoreGateLib TrkExInterfaces TrkExUtils
+ PRIVATE_LINK_LIBRARIES EventPrimitives MagFieldElements TrkParameters TrkSurfaces )
# Component(s) in the package:
atlas_add_component( TrkExSolenoidalIntersector
src/components/*.cxx
- LINK_LIBRARIES ${EIGEN_LIBRARIES} TrkExSolenoidalIntersectorLib )
+ LINK_LIBRARIES TrkExSolenoidalIntersectorLib )
# Tests in the package:
atlas_add_test( SolenoidParametrization_test
SOURCES test/SolenoidParametrization_test.cxx
- LINK_LIBRARIES TrkExUtils GaudiKernel TestTools PathResolver MagFieldElements MagFieldConditions
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel GaudiKernel MagFieldConditions MagFieldElements PathResolver TestTools TrkExSolenoidalIntersectorLib
PROPERTIES TIMEOUT 300
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
-
atlas_add_test( SolenoidalIntersector_test
SOURCES test/SolenoidalIntersector_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES TrkExUtils GaudiKernel TestTools CxxUtils ${ROOT_LIBRARIES} MagFieldElements MagFieldConditions PathResolver TrkExSolenoidalIntersectorLib
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel MagFieldConditions MagFieldElements PathResolver SGTools StoreGateLib TestTools TrkExInterfaces TrkExSolenoidalIntersectorLib
PROPERTIES TIMEOUT 300
ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
diff --git a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/CMakeLists.txt
index 94a39be02da027a909bd25661e5395b3bc92180c..a983559a38d82773c8be58af4feb3455e8ddcc47 100644
--- a/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExStraightLineIntersector/CMakeLists.txt
@@ -1,21 +1,8 @@
-################################################################################
-# Package: TrkExStraightLineIntersector
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkExStraightLineIntersector )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkExtrapolation/TrkExUtils
- PRIVATE
- GaudiKernel
- AtlasTest/TestTools
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkParameters )
-
# External dependencies:
find_package( CLHEP )
@@ -24,11 +11,9 @@ atlas_add_component( TrkExStraightLineIntersector
src/StraightLineIntersector.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps TrkExInterfaces TrkExUtils GaudiKernel TrkSurfaces TrkParameters TrkExInterfaces )
-
-# Install files from the package:
-atlas_install_headers( TrkExStraightLineIntersector )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps TrkExInterfaces TrkExUtils TrkSurfaces TrkParameters TrkExInterfaces )
+# Tests in the package:
atlas_add_test( StraightLineIntersector_test
SOURCES test/StraightLineIntersector_test.cxx
- LINK_LIBRARIES TrkExUtils TestTools GaudiKernel TrkExInterfaces )
+ LINK_LIBRARIES TestTools GaudiKernel TrkExInterfaces )
diff --git a/Tracking/TrkExtrapolation/TrkExTools/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExTools/CMakeLists.txt
index ef8b3003cfcc065dfa1a7610198381e464de9e6d..3e9cef7b0d78e1edecf6d16fbca9eb9411e16226 100644
--- a/Tracking/TrkExtrapolation/TrkExTools/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExTools/CMakeLists.txt
@@ -1,56 +1,26 @@
-################################################################################
-# Package: TrkExTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkExTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- DetectorDescription/GeoPrimitives
- Event/EventPrimitives
- Event/xAOD/xAODTracking
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkDetDescr/TrkVolumes
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkNeutralParameters
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkExtrapolation/TrkExUtils
- PRIVATE
- Control/AthContainers
- Control/CxxUtils
- Tracking/TrkDetDescr/TrkDetDescrInterfaces
- Tracking/TrkEvent/TrkEventUtils
- Tracking/TrkEvent/TrkMaterialOnTrack
- Tracking/TrkEvent/TrkParticleBase
- Tracking/TrkEvent/TrkTrack )
-
# External dependencies:
find_package( CLHEP )
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-find_package( Boost COMPONENTS unit_test_framework )
+find_package( Boost )
# Component(s) in the package:
atlas_add_component( TrkExTools
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives
- EventPrimitives xAODTracking GaudiKernel TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes TrkEventPrimitives
- TrkNeutralParameters TrkParameters TrkExInterfaces TrkExUtils AthContainers CxxUtils TrkDetDescrInterfaces TrkEventUtils
- TrkMaterialOnTrack TrkParticleBase TrkTrack )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives
+ EventPrimitives xAODTracking GaudiKernel TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes TrkEventPrimitives
+ TrkNeutralParameters TrkParameters TrkExInterfaces TrkExUtils AthContainers CxxUtils TrkDetDescrInterfaces TrkEventUtils
+ TrkMaterialOnTrack TrkParticleBase TrkTrack StoreGateLib )
# Install files from the package:
-atlas_install_headers( TrkExTools )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+# Tests in the package:
atlas_add_test( ObjContainer_test
SOURCES test/ObjContainer_test.cxx
LINK_LIBRARIES CxxUtils )
diff --git a/Tracking/TrkExtrapolation/TrkExUnitTests/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExUnitTests/CMakeLists.txt
index c28d67f4d1bfc815d38f75ea73c695dfc764b035..f1e3a38ed73cd03c0f20bdca0a2a00e384aae0a3 100644
--- a/Tracking/TrkExtrapolation/TrkExUnitTests/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExUnitTests/CMakeLists.txt
@@ -1,36 +1,14 @@
-################################################################################
-# Package: TrkExUnitTests
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkExUnitTests )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkNeutralParameters
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkExtrapolation/TrkExUtils
- Tracking/TrkValidation/TrkValInterfaces )
-
# 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 )
# Component(s) in the package:
atlas_add_component( TrkExUnitTests
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel TrkGeometry TrkEventPrimitives TrkNeutralParameters TrkParameters TrkExInterfaces TrkExUtils TrkValInterfaces )
-
-# Install files from the package:
-atlas_install_headers( TrkExUnitTests )
-
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel GeoPrimitives TrkEventPrimitives TrkExInterfaces TrkExUtils TrkGeometry TrkNeutralParameters TrkParameters TrkValInterfaces )
diff --git a/Tracking/TrkExtrapolation/TrkExUtils/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExUtils/CMakeLists.txt
index e31d25ccd6c50a3df78d1210c2fb90b78ac9b499..5de11cd06e1e106edc513786b9f33b6521cf171f 100644
--- a/Tracking/TrkExtrapolation/TrkExUtils/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExUtils/CMakeLists.txt
@@ -1,37 +1,12 @@
-################################################################################
-# Package: TrkExUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkExUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/GeoPrimitives
- Event/EventPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkMaterialOnTrack
- Tracking/TrkEvent/TrkNeutralParameters
- Tracking/TrkEvent/TrkParameters
- PRIVATE
- Tracking/TrkEvent/TrkPatternParameters
- Control/CxxUtils
- )
-
-# External dependencies:
-find_package( Eigen )
-
# Component(s) in the package:
atlas_add_library( TrkExUtils
src/*.cxx
PUBLIC_HEADERS TrkExUtils
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives EventPrimitives GaudiKernel TrkDetDescrUtils TrkGeometry
- TrkSurfaces TrkEventPrimitives TrkMaterialOnTrack TrkNeutralParameters TrkParameters CxxUtils
- TrkPatternParameters
-)
-
+ LINK_LIBRARIES GeoPrimitives EventPrimitives GaudiKernel TrkDetDescrUtils TrkGeometry
+ TrkSurfaces TrkEventPrimitives TrkMaterialOnTrack TrkNeutralParameters TrkParameters CxxUtils
+ PRIVATE_LINK_LIBRARIES TrkPatternParameters )