From 3ac18af59fd14e8a9c6f5f80161198cb63e955da Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Mon, 19 Oct 2020 11:34:45 +0200
Subject: [PATCH] ActsGeometry: cmake cleanup, enable flake8
Remove `atlas_depends_on_subdirs` and fix library and external dependencies.
---
Tracking/Acts/ActsGeometry/CMakeLists.txt | 81 +++++++++----------
.../python/ActsGeometryConfigDb.py | 1 +
.../python/ActsTrackingGeometryTool.py | 2 -
3 files changed, 39 insertions(+), 45 deletions(-)
diff --git a/Tracking/Acts/ActsGeometry/CMakeLists.txt b/Tracking/Acts/ActsGeometry/CMakeLists.txt
index e78c9dcbb21..496b225f026 100755
--- a/Tracking/Acts/ActsGeometry/CMakeLists.txt
+++ b/Tracking/Acts/ActsGeometry/CMakeLists.txt
@@ -1,37 +1,17 @@
+# 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} )
diff --git a/Tracking/Acts/ActsGeometry/python/ActsGeometryConfigDb.py b/Tracking/Acts/ActsGeometry/python/ActsGeometryConfigDb.py
index 0214f13ccca..27024f51cc8 100644
--- a/Tracking/Acts/ActsGeometry/python/ActsGeometryConfigDb.py
+++ b/Tracking/Acts/ActsGeometry/python/ActsGeometryConfigDb.py
@@ -1,3 +1,4 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.CfgGetter import addService
addService('ActsGeometry.ActsGeometryConfig.TrackingGeometrySvc', 'TrackingGeometrySvc')
diff --git a/Tracking/Acts/ActsGeometry/python/ActsTrackingGeometryTool.py b/Tracking/Acts/ActsGeometry/python/ActsTrackingGeometryTool.py
index 0537e430445..3c513213131 100644
--- a/Tracking/Acts/ActsGeometry/python/ActsTrackingGeometryTool.py
+++ b/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
--
GitLab