diff --git a/Tracking/TrkValidation/TrkValAlgs/CMakeLists.txt b/Tracking/TrkValidation/TrkValAlgs/CMakeLists.txt
index eb46684f5997a7bf3a5829bf908fd3b3f23efa7f..9f3c3694fc8c2f1856f662b4bd3f9399ef8bf0c5 100644
--- a/Tracking/TrkValidation/TrkValAlgs/CMakeLists.txt
+++ b/Tracking/TrkValidation/TrkValAlgs/CMakeLists.txt
@@ -1,46 +1,18 @@
-# $Id: CMakeLists.txt 769538 2016-08-23 12:55:49Z krasznaa $
-################################################################################
-# Package: TrkValAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkValAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/TrkTruthData
- PRIVATE
- DetectorDescription/AtlasDetDescr
- Generators/GeneratorObjects
- Generators/AtlasHepMC
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkEventUtils
- Tracking/TrkEvent/TrkMaterialOnTrack
- Tracking/TrkEvent/TrkParticleBase
- Tracking/TrkEvent/TrkPrepRawData
- Tracking/TrkEvent/TrkRIO_OnTrack
- Tracking/TrkEvent/TrkSegment
- Tracking/TrkEvent/TrkSpacePoint
- Tracking/TrkEvent/TrkTrackSummary
- Tracking/TrkEvent/VxVertex
- Tracking/TrkTools/TrkToolInterfaces
- Tracking/TrkValidation/TrkValEvent
- Tracking/TrkValidation/TrkValInterfaces )
-
# External dependencies:
+find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree )
# Component(s) in the package:
atlas_add_component( TrkValAlgs
TrkValAlgs/*.h src/*.cxx src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasHepMCLib AthenaBaseComps
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AtlasHepMCLib AthenaBaseComps
GaudiKernel TrkParameters TrkTrack TrkTruthData AtlasDetDescr
GeneratorObjects TrkSurfaces TrkEventUtils TrkMaterialOnTrack
- TrkParticleBase TrkPrepRawData TrkRIO_OnTrack TrkSegment TrkSpacePoint
+ TrkParticleBase TrkPrepRawData TrkRIO_OnTrack TrkSegment
TrkTrackSummary VxVertex TrkToolInterfaces TrkValEvent TrkValInterfaces )
diff --git a/Tracking/TrkValidation/TrkValEvent/CMakeLists.txt b/Tracking/TrkValidation/TrkValEvent/CMakeLists.txt
index 4ba1fed21b327e1e42c4a82700c540016849cb95..7d654d2a1718e08a8617987128b4ede09add932a 100644
--- a/Tracking/TrkValidation/TrkValEvent/CMakeLists.txt
+++ b/Tracking/TrkValidation/TrkValEvent/CMakeLists.txt
@@ -1,17 +1,8 @@
-################################################################################
-# Package: TrkValEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkValEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkTrack
- Generators/AtlasHepMC )
-
# External dependencies:
find_package( CLHEP )
diff --git a/Tracking/TrkValidation/TrkValHistUtils/CMakeLists.txt b/Tracking/TrkValidation/TrkValHistUtils/CMakeLists.txt
index a010f87b4f785170ee9ca4a052997eb9ab5deb9f..96e7fe7813a103c1584eaac9d6fe9bb14c2dd7dc 100644
--- a/Tracking/TrkValidation/TrkValHistUtils/CMakeLists.txt
+++ b/Tracking/TrkValidation/TrkValHistUtils/CMakeLists.txt
@@ -1,26 +1,13 @@
-################################################################################
-# Package: TrkValHistUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkValHistUtils )
-set( extra_deps )
set( extra_libs )
if( NOT XAOD_ANALYSIS )
- set( extra_dep Tracking/TrkEvent/TrkEventPrimitives )
set( extra_libs TrkEventPrimitives )
endif()
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODBase
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTruth
- PRIVATE
- Event/EventPrimitives
- ${extra_deps} )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
diff --git a/Tracking/TrkValidation/TrkValInterfaces/CMakeLists.txt b/Tracking/TrkValidation/TrkValInterfaces/CMakeLists.txt
index db26f36c7b07cca6687036918c911e1d1ebe4e3a..5e818195981aa55b338736937ab98eba2bac4ecc 100644
--- a/Tracking/TrkValidation/TrkValInterfaces/CMakeLists.txt
+++ b/Tracking/TrkValidation/TrkValInterfaces/CMakeLists.txt
@@ -1,26 +1,11 @@
-# $Id: CMakeLists.txt 771258 2016-09-01 12:03:17Z aalonso $
-################################################################################
-# Package: TrkValInterfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkValInterfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkTrack)
- # Tracking/TrkEvent/TrkTrack
- # Tracking/TrkFitter/TrkFitterUtils )
-
# Component(s) in the package:
atlas_add_library( TrkValInterfaces
TrkValInterfaces/*.h
INTERFACE
PUBLIC_HEADERS TrkValInterfaces
- LINK_LIBRARIES GeoPrimitives GaudiKernel TrkEventPrimitives TrkParameters
- TrkTrack )
+ LINK_LIBRARIES AtlasHepMCLib GeoPrimitives GaudiKernel TrkEventPrimitives TrkParameters )
diff --git a/Tracking/TrkValidation/TrkValTools/CMakeLists.txt b/Tracking/TrkValidation/TrkValTools/CMakeLists.txt
index acc3736bdd8723e43d3ef3cfac4995b71770c971..c87361f66e8cd454da2d48dbf975a16ffcd27759 100644
--- a/Tracking/TrkValidation/TrkValTools/CMakeLists.txt
+++ b/Tracking/TrkValidation/TrkValTools/CMakeLists.txt
@@ -1,75 +1,23 @@
-################################################################################
-# Package: TrkValTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkValTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaMonitoring
- Control/AthContainers
- Control/AthenaKernel
- Event/xAOD/xAODTracking
- GaudiKernel
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkTools/TrkToolInterfaces
- Tracking/TrkValidation/TrkValEvent
- Tracking/TrkValidation/TrkValInterfaces
- InnerDetector/InDetRecTools/InDetTrackSelectionTool
- GaudiKernel
- Event/xAOD/xAODCore
- Event/xAOD/xAODJet
- Event/xAOD/xAODTruth
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODPFlow
- Event/xAOD/xAODCaloEvent
- InnerDetector/InDetRecTools/TrackVertexAssociationTool
- Commission/CommissionEvent
- PRIVATE
- Commission/CommissionEvent
- DetectorDescription/AtlasDetDescr
- Control/AthToolSupport/AsgTools
- Control/AthenaKernel
- Event/EventInfo
- Event/EventPrimitives
- Generators/GeneratorObjects
- Generators/AtlasHepMC
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkCompetingRIOsOnTrack
- Tracking/TrkEvent/TrkEventUtils
- Tracking/TrkEvent/TrkMaterialOnTrack
- Tracking/TrkEvent/TrkMeasurementBase
- Tracking/TrkEvent/TrkParticleBase
- Tracking/TrkEvent/TrkRIO_OnTrack
- Tracking/TrkEvent/TrkTrackSummary
- Tracking/TrkEvent/TrkTruthData
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkFitter/TrkFitterUtils
- Tools/PathResolver)
-
# External dependencies:
find_package( CLHEP )
find_package( HepPDT )
-find_package( ROOT COMPONENTS Core EG Tree MathCore Hist RIO pthread Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
-find_package( Eigen )
-find_package( XercesC )
-find_package( Boost )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO Graf )
atlas_add_library( TrkValToolsLib
TrkValTools/*.h
INTERFACE
INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS}
PUBLIC_HEADERS TrkValTools
- LINK_LIBRARIES GaudiKernel AthenaBaseComps TrkValInterfaces StoreGateLib xAODEventInfo TrkParameters TrkValEvent AtlasHepMCLib TrkEventPrimitives TrkTrack AthContainers )
+ LINK_LIBRARIES ${HEPPDT_LIBRARIES} GaudiKernel AthenaBaseComps TrkValInterfaces StoreGateLib xAODEventInfo TrkParameters TrkValEvent AtlasHepMCLib TrkEventPrimitives TrkTrack AthContainers )
# Component(s) in the package:
atlas_add_component( TrkValTools
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} TrkValToolsLib AthenaKernel xAODTracking TrkToolInterfaces CommissionEvent AtlasDetDescr EventInfo EventPrimitives GeneratorObjects TrkSurfaces TrkCompetingRIOsOnTrack TrkEventUtils TrkMaterialOnTrack TrkMeasurementBase TrkParticleBase TrkRIO_OnTrack TrkTrackSummary TrkTruthData TrkExInterfaces TrkFitterUtils xAODTruth xAODJet xAODPFlow xAODCaloEvent xAODCore AsgTools AthenaKernel AthenaMonitoringLib)
-
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} AtlasDetDescr AtlasHepMCLib CommissionEvent EventInfo EventPrimitives GaudiKernel GeneratorObjects TrkCompetingRIOsOnTrack TrkEventPrimitives TrkEventUtils TrkExInterfaces TrkFitterUtils TrkMaterialOnTrack TrkMeasurementBase TrkParameters TrkParticleBase TrkRIO_OnTrack TrkSurfaces TrkToolInterfaces TrkTrack TrkTrackSummary TrkTruthData TrkValEvent TrkValInterfaces TrkValToolsLib )
diff --git a/Tracking/TrkValidation/TrkVertexFitterValidationInterfaces/CMakeLists.txt b/Tracking/TrkValidation/TrkVertexFitterValidationInterfaces/CMakeLists.txt
index 67e17f5aed968aaed30eda2b6427515287fd30e6..3b97ec4ee9e71a03321834a83db3538de21d8da9 100644
--- a/Tracking/TrkValidation/TrkVertexFitterValidationInterfaces/CMakeLists.txt
+++ b/Tracking/TrkValidation/TrkVertexFitterValidationInterfaces/CMakeLists.txt
@@ -1,20 +1,10 @@
-################################################################################
-# Package: TrkVertexFitterValidationInterfaces
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkVertexFitterValidationInterfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- GaudiKernel
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/TrkTruthData
- Tracking/TrkEvent/VxVertex
- Generators/AtlasHepMC )
-
-# External dependencies:
-
-# Install files from the package:
-atlas_install_headers( TrkVertexFitterValidationInterfaces )
-
+atlas_add_library( TrkVertexFitterValidationInterfacesLib
+ TrkVertexFitterValidationInterfaces/*.h
+ INTERFACE
+ PUBLIC_HEADERS TrkVertexFitterValidationInterfaces
+ LINK_LIBRARIES AtlasHepMCLib GaudiKernel TrkTrack TrkTruthData VxVertex )
diff --git a/Tracking/TrkValidation/TrkVertexFitterValidationTools/CMakeLists.txt b/Tracking/TrkValidation/TrkVertexFitterValidationTools/CMakeLists.txt
index 5765b158d28b4601d940684dabc73242ef506729..7ce7e951b6cb51d2269a0148451245fcf212f001 100644
--- a/Tracking/TrkValidation/TrkVertexFitterValidationTools/CMakeLists.txt
+++ b/Tracking/TrkValidation/TrkVertexFitterValidationTools/CMakeLists.txt
@@ -1,24 +1,8 @@
-################################################################################
-# Package: TrkVertexFitterValidationTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkVertexFitterValidationTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- Tracking/TrkValidation/TrkVertexFitterValidationInterfaces
- PRIVATE
- Event/EventPrimitives
- Event/xAOD/xAODEventInfo
- Generators/GeneratorObjects
- Generators/AtlasHepMC
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/TrkTruthData
- Tracking/TrkEvent/VxVertex )
-
# External dependencies:
find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -28,8 +12,4 @@ atlas_add_component( TrkVertexFitterValidationTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel EventPrimitives xAODEventInfo GeneratorObjects TrkTrack TrkTruthData VxVertex )
-
-# Install files from the package:
-atlas_install_headers( TrkVertexFitterValidationTools )
-
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps GaudiKernel EventPrimitives xAODEventInfo GeneratorObjects TrkTrack TrkTruthData TrkVertexFitterValidationInterfacesLib VxVertex )
diff --git a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/CMakeLists.txt b/Tracking/TrkValidation/TrkVertexFitterValidationUtils/CMakeLists.txt
index 2cb335b447fa889cd4dd99096e17bf4a0d4008dc..c8fee38fd4ebaf96029784d00d9cc59a0cc45dd7 100644
--- a/Tracking/TrkValidation/TrkVertexFitterValidationUtils/CMakeLists.txt
+++ b/Tracking/TrkValidation/TrkVertexFitterValidationUtils/CMakeLists.txt
@@ -1,23 +1,8 @@
-################################################################################
-# Package: TrkVertexFitterValidationUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkVertexFitterValidationUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- PRIVATE
- Generators/GeneratorObjects
- Generators/AtlasHepMC
- Reconstruction/ParticleTruth
- Tracking/TrkEvent/TrkParticleBase
- Tracking/TrkEvent/VxVertex )
-
-# External dependencies:
-
# Component(s) in the package:
atlas_add_library( TrkVertexFitterValidationUtilsLib
src/*.cxx
@@ -28,6 +13,4 @@ atlas_add_library( TrkVertexFitterValidationUtilsLib
atlas_add_component( TrkVertexFitterValidationUtils
src/components/*.cxx
- INCLUDE_DIRS
- LINK_LIBRARIES AtlasHepMCLib AthenaBaseComps GaudiKernel GeneratorObjects ParticleTruth TrkParticleBase VxVertex TrkVertexFitterValidationUtilsLib )
-
+ LINK_LIBRARIES TrkVertexFitterValidationUtilsLib )