Merge branch 'cmake_acts' into 'master'

Tracking/Acts: cmake cleanup

See merge request atlas/athena!37395

Tracking/Acts/ActsGeometry/CMakeLists.txt

+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( ActsGeometry )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/Identifier
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          Control/AthenaBaseComps
-                          AthenaKernel
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          DetectorDescription/GeoPrimitives
-                          Event/EventInfo
-                          GaudiKernel
-                          MagFieldElements MagFieldConditions
-                          Calorimeter/CaloDetDescr
-                          Tracking/Acts/ActsGeometryInterfaces
-                          Tracking/Acts/ActsInterop
-                          Tracking/TrkDetDescr/TrkGeometry)
-
 # External dependencies:
-find_package( CLHEP )
-find_package( Eigen )
+find_package( Acts COMPONENTS Core PluginJson )
 find_package( Boost )
-find_package( nlohmann_json )
-
-find_package( Acts COMPONENTS Core PluginJson)
+find_package( CLHEP )
+find_package( GeoModelCore )
+find_package( ROOT COMPONENTS Core Tree RIO )
+find_package( TBB )
 
 # Component(s) in the package:
-
 atlas_add_library( ActsGeometryLib
                    src/ActsAlignmentStore.cxx
                    src/ActsDetectorElement.cxx
@@ -40,16 +20,28 @@ atlas_add_library( ActsGeometryLib
                    src/ActsTrackingGeometrySvc.cxx
                    src/util/*.cxx
                    PUBLIC_HEADERS ActsGeometry
-                   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES}
-                   AthenaKernel
-                   ActsInteropLib
-                   ActsGeometryInterfacesLib
+                   INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS}
+                   LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${TBB_LIBRARIES}
                    ActsCore
+                   ActsGeometryInterfacesLib
+                   ActsInteropLib
                    ActsPluginJson
-                   TrkGeometry
+                   AthenaBaseComps
+                   AthenaKernel
+                   CaloDetDescrLib
+                   EventInfo
+                   GaudiKernel
+                   GeoModelUtilities
+                   GeoPrimitives
+                   Identifier
+                   InDetIdentifier
+                   InDetReadoutGeometry
+                   MagFieldConditions
+                   PRIVATE_LINK_LIBRARIES
+                   StoreGateLib
                    TRT_ReadoutGeometry
-                   MagFieldElements MagFieldConditions)
+                   TrkGeometry
+                   TrkSurfaces )
 
 atlas_add_component( ActsGeometry
                      src/ActsExtrapolationAlg.cxx
@@ -71,17 +63,20 @@ atlas_add_component( ActsGeometry
                      src/ActsPropStepRootWriterSvc.cxx
                      src/ActsCaloTrackingVolumeBuilder.cxx
                      src/components/*.cxx
-                     PUBLIC_HEADERS ActsGeometry
-                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES}
-                     EventInfo
-                     CaloDetDescrLib
-                     ActsInteropLib
-                     ActsGeometryLib
+                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} ${ROOT_LIBRARIES}
                      ActsGeometryInterfacesLib
-                     ActsCore
-                     ActsPluginJson)
+                     ActsGeometryLib
+                     ActsInteropLib
+                     AthenaBaseComps
+                     AthenaKernel
+                     CaloDetDescrLib
+                     EventInfo
+                     GaudiKernel
+                     StoreGateLib
+                     TRT_ReadoutGeometry
+                     TrkGeometry )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )

Tracking/Acts/ActsGeometry/python/ActsGeometryConfigDb.py

+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 from AthenaCommon.CfgGetter import addService
 
 addService('ActsGeometry.ActsGeometryConfig.TrackingGeometrySvc', 'TrackingGeometrySvc')

Tracking/Acts/ActsGeometry/python/ActsTrackingGeometryTool.py

@@ -12,8 +12,6 @@ from __future__ import print_function
 # import the DetFlags for the setting
 from AthenaCommon.DetFlags import DetFlags
 
-from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags
-
 # import the Extrapolator configurable
 from ActsGeometry.ActsGeometryConf import ActsTrackingGeometryTool
    

Tracking/Acts/ActsGeometryInterfaces/CMakeLists.txt

+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( ActsGeometryInterfaces )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          PRIVATE
-                          Control/StoreGate
-                          AthenaKernel
-                          AthenaBaseComps
-                          GaudiKernel
-                          ActsInterop )
-
 # External dependencies:
-find_package( Eigen )
 find_package( Acts COMPONENTS Core )
 
 # Component(s) in the package:
-
 atlas_add_library( ActsGeometryInterfacesLib
                    ActsGeometryInterfaces/*.h
                    INTERFACE
                    PUBLIC_HEADERS ActsGeometryInterfaces
-                   INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${EIGEN_LIBRARIES}
-                   AthenaKernel
-                   ActsInteropLib
-                   ActsCore)
+                   LINK_LIBRARIES
+                   AthenaBaseComps
+                   ActsCore
+                   ActsGeometryLib
+                   GaudiKernel
+                   TrkGeometry )

Tracking/Acts/ActsPriVtxFinder/CMakeLists.txt

+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( ActsPriVtxFinder )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          PRIVATE
-                          Control/StoreGate
-                          DetectorDescription/Identifier
-                          InnerDetector/InDetDetDescr/InDetIdentifier
-                          InnerDetector/InDetDetDescr/InDetReadoutGeometry
-                          InnerDetector/InDetDetDescr/PixelReadoutGeometry
-                          InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
-                          InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
-                          InnerDetector/InDetConditions/BeamSpotConditionsData
-                          InnerDetector/InDetRecTools/InDetTrackSelectionTool
-                          Control/AthenaBaseComps
-                          AthenaKernel
-                          DetectorDescription/GeoModel/GeoModelUtilities
-                          DetectorDescription/GeoPrimitives
-                          Event/EventInfo
-                          GaudiKernel
-                          MagFieldElements MagFieldConditions
-                          Calorimeter/CaloDetDescr
-                          Tracking/Acts/ActsInterop
-                          Tracking/TrkEvent/TrkTrackLink
-                          Tracking/TrkEvent/TrkLinks 
-                          Event/xAOD/xAODCore
-                          Event/xAOD/xAODTracking
-                          Reconstruction/RecoTools/ITrackToVertex
-                          Tracking/TrkDetDescr/TrkSurfaces
-                          Tracking/TrkEvent/TrkParticleBase
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/VxVertex
-                          Tracking/TrkVertexFitter/TrkVertexFitterInterfaces
-                          InnerDetector/InDetRecTools/InDetRecToolInterfaces )
-
 # External dependencies:
-find_package( CLHEP )
-find_package( Eigen )
-find_package( Boost )
-
 find_package( Acts COMPONENTS Core )
+find_package( Boost )
 
 # Component(s) in the package:
-
-atlas_add_library( ActsPriVtxFinderLib
-                   PUBLIC_HEADERS ActsPriVtxFinder
-                   INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS}
-                   LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES}
-                   AthenaKernel
-                   ActsInteropLib
-                   ActsGeometryLib
-                   ActsGeometryInterfacesLib
-                   ActsCore
-                   PixelReadoutGeometry
-                   SCT_ReadoutGeometry
-                   TRT_ReadoutGeometry
-                   BeamSpotConditionsData
-                   InDetTrackSelectionToolLib
-                   TrkLinks
-                   xAODCore 
-                   xAODTracking 
-                   ITrackToVertex 
-                   TrkSurfaces 
-                   TrkParticleBase 
-                   TrkTrack 
-                   VxVertex
-                   TrkVertexFitterInterfaces
-                   AthenaMonitoringKernelLib
-                   InDetRecToolInterfaces 
-                   MagFieldElements MagFieldConditions)
-
 atlas_add_component( ActsPriVtxFinder
                      src/*.cxx
                      src/components/*.cxx
-                     PUBLIC_HEADERS ActsPriVtxFinder
-                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} 
-                     EventInfo
-                     CaloDetDescrLib
-                     ActsInteropLib 
-                     ActsPriVtxFinderLib
-                     ActsGeometryLib
-                     ActsGeometryInterfacesLib
+                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${Boost_LIBRARIES}
                      ActsCore
+                     ActsGeometryInterfacesLib
+                     ActsGeometryLib
+                     ActsInteropLib
+                     AthenaBaseComps
                      BeamSpotConditionsData
+                     GaudiKernel
+                     InDetRecToolInterfaces
+                     InDetTrackSelectionToolLib
                      TrkLinks
-                     xAODCore 
-                     xAODTracking 
-                     ITrackToVertex 
-                     TrkSurfaces 
-                     TrkParticleBase 
-                     TrkTrack 
-                     VxVertex
-                     TrkVertexFitterInterfaces 
-                     AthenaMonitoringKernelLib
-                     InDetRecToolInterfaces )
+                     TrkParticleBase
+                     TrkTrack
+                     TrkTrackLink
+                     xAODTracking )

Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx

@@ -2,7 +2,7 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h"
+#include "ActsAdaptiveMultiPriVtxFinderTool.h"
 
 // ATHENA
 #include "GaudiKernel/IInterface.h"

Tracking/Acts/ActsPriVtxFinder/src/components/ActsPriVtxFinder_entries.cxx

@@ -3,7 +3,7 @@
 */
 
 //#include "ActsPriVtxFinder/ActsPrimaryVtxFinderAlg.h"
-#include "ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h"
+#include "../ActsAdaptiveMultiPriVtxFinderTool.h"
 
 // DECLARE_COMPONENT( ActsPrimaryVtxFinderAlg )
 DECLARE_COMPONENT( ActsAdaptiveMultiPriVtxFinderTool )