From 37586721abffe3e765ecc4c483f9b23a22c4d2e5 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Fri, 10 Jan 2020 14:52:32 +0100
Subject: [PATCH] Migrate cmake configuration to FindPython
Replace `PythonLibs` and `PythonInterp` to the corresponding
`find_package( Python ... )` calls. And remove the dependency entirely
where not necessary.
---
Control/AthenaPython/CMakeLists.txt | 2 +-
Control/AthenaServices/CMakeLists.txt | 2 +-
Control/Hephaestus/CMakeLists.txt | 2 +-
Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt | 2 +-
Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt | 2 +-
Control/PyKernel/CMakeLists.txt | 2 +-
Control/RootUtils/CMakeLists.txt | 2 +-
Control/StoreGateBindings/CMakeLists.txt | 2 +-
DataQuality/DQUtils/CMakeLists.txt | 2 +-
HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt | 2 +-
.../MuonCalib/MuonCalibJobTransforms/CMakeLists.txt | 3 ---
PhysicsAnalysis/AnalysisCommon/AnalysisTools/CMakeLists.txt | 2 +-
PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/CMakeLists.txt | 2 +-
PhysicsAnalysis/TruthParticleID/McParticleUtils/CMakeLists.txt | 2 +-
Projects/AnalysisTop/CMakeLists.txt | 2 +-
Projects/VP1Light/CMakeLists.txt | 2 +-
Reconstruction/RecJobTransforms/CMakeLists.txt | 3 ---
Simulation/SimuJobTransforms/CMakeLists.txt | 3 ---
Tools/FullChainTransforms/CMakeLists.txt | 3 ---
Tools/JobTransforms/CMakeLists.txt | 2 --
Tools/PyJobTransforms/CMakeLists.txt | 1 -
Tools/PyJobTransformsCore/CMakeLists.txt | 3 ---
Tools/PyUtils/CMakeLists.txt | 1 -
Trigger/TrigConfiguration/TrigConfDBConnection/CMakeLists.txt | 2 +-
Trigger/TrigT1/L1Common/CMakeLists.txt | 2 +-
25 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/Control/AthenaPython/CMakeLists.txt b/Control/AthenaPython/CMakeLists.txt
index 8dbf7e78b14..4146c992634 100644
--- a/Control/AthenaPython/CMakeLists.txt
+++ b/Control/AthenaPython/CMakeLists.txt
@@ -16,7 +16,7 @@ atlas_depends_on_subdirs( PUBLIC
Control/DataModelRoot )
# External dependencies:
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread PyROOT )
# Component(s) in the package:
diff --git a/Control/AthenaServices/CMakeLists.txt b/Control/AthenaServices/CMakeLists.txt
index 37b4bfe48da..4665818c445 100644
--- a/Control/AthenaServices/CMakeLists.txt
+++ b/Control/AthenaServices/CMakeLists.txt
@@ -32,7 +32,7 @@ atlas_depends_on_subdirs(
# External dependencies:
find_package( Boost COMPONENTS thread )
find_package( CLHEP )
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
find_package( yampl )
# Component(s) in the package:
diff --git a/Control/Hephaestus/CMakeLists.txt b/Control/Hephaestus/CMakeLists.txt
index 5f744f1bfa3..82e542b1139 100644
--- a/Control/Hephaestus/CMakeLists.txt
+++ b/Control/Hephaestus/CMakeLists.txt
@@ -7,7 +7,7 @@ atlas_subdir( Hephaestus )
# External dependencies:
find_package( Boost )
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
find_package( libunwind )
# Component(s) in the package:
diff --git a/Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt
index da2fb50fa54..50c9353666a 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonComps/CMakeLists.txt
@@ -22,7 +22,7 @@ atlas_depends_on_subdirs(
# External dependencies:
find_package( AIDA )
find_package( Boost )
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS Core PyROOT )
find_package( nlohmann_json )
diff --git a/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt
index b71e7773dfb..4f034c34c22 100644
--- a/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonEvent/CMakeLists.txt
@@ -10,7 +10,7 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel )
# External dependencies:
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# We don't have a direct dependency on boost from this package, but if we
diff --git a/Control/PyKernel/CMakeLists.txt b/Control/PyKernel/CMakeLists.txt
index d07cfaafd28..7bb861fa7c8 100644
--- a/Control/PyKernel/CMakeLists.txt
+++ b/Control/PyKernel/CMakeLists.txt
@@ -6,7 +6,7 @@
atlas_subdir( PyKernel )
# External dependencies:
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
diff --git a/Control/RootUtils/CMakeLists.txt b/Control/RootUtils/CMakeLists.txt
index b0cad61cea6..eb8cd357a54 100644
--- a/Control/RootUtils/CMakeLists.txt
+++ b/Control/RootUtils/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS RIO Hist Tree PyROOT Core MathCore pthread )
string( REPLACE PyROOT Core ROOT_LIBRARIES_NOPYROOT "${ROOT_LIBRARIES}" )
diff --git a/Control/StoreGateBindings/CMakeLists.txt b/Control/StoreGateBindings/CMakeLists.txt
index 0aec821a9e2..289794d2f5b 100644
--- a/Control/StoreGateBindings/CMakeLists.txt
+++ b/Control/StoreGateBindings/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_depends_on_subdirs( PRIVATE
GaudiKernel )
# External dependencies:
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS PyROOT Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
diff --git a/DataQuality/DQUtils/CMakeLists.txt b/DataQuality/DQUtils/CMakeLists.txt
index 9f521282ffc..33ef6e8a44a 100644
--- a/DataQuality/DQUtils/CMakeLists.txt
+++ b/DataQuality/DQUtils/CMakeLists.txt
@@ -14,7 +14,7 @@ find_package( Boost COMPONENTS filesystem thread system )
find_package( COOL COMPONENTS CoolKernel CoolApplication )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( Oracle )
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
find_package( six )
find_package( sqlalchemy )
diff --git a/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt b/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt
index fa76bd32066..5592e15dc91 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt
+++ b/HLT/Trigger/TrigControl/TrigPSC/CMakeLists.txt
@@ -16,7 +16,7 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
find_package( tdaq-common COMPONENTS ers eformat eformat_write hltinterface )
# Component(s) in the package:
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibJobTransforms/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibJobTransforms/CMakeLists.txt
index 437ce8746ea..60a7de2ec51 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibJobTransforms/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibJobTransforms/CMakeLists.txt
@@ -9,9 +9,6 @@ atlas_subdir( MuonCalibJobTransforms )
atlas_depends_on_subdirs( PUBLIC
Tools/PyJobTransformsCore )
-# External dependencies:
-find_package( PythonLibs )
-
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_runtime( share/RT_default_comm.dat )
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/CMakeLists.txt
index 76a1938458f..343f2910804 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTools/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTools/CMakeLists.txt
@@ -24,7 +24,7 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
diff --git a/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/CMakeLists.txt b/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/CMakeLists.txt
index 6ad1dc198ff..1846255fe05 100644
--- a/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/CMakeLists.txt
+++ b/PhysicsAnalysis/PyAnalysis/PyAnalysisExamples/CMakeLists.txt
@@ -18,7 +18,7 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( CLHEP )
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleUtils/CMakeLists.txt b/PhysicsAnalysis/TruthParticleID/McParticleUtils/CMakeLists.txt
index 21b5fd99a04..94a4b7208d8 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleUtils/CMakeLists.txt
+++ b/PhysicsAnalysis/TruthParticleID/McParticleUtils/CMakeLists.txt
@@ -23,7 +23,7 @@ find_package( CLHEP )
find_package( CppUnit )
find_package( HepMC )
find_package( HepPDT )
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
# Component(s) in the package:
atlas_add_library( McParticleUtils
diff --git a/Projects/AnalysisTop/CMakeLists.txt b/Projects/AnalysisTop/CMakeLists.txt
index fbfcbe790ea..4215f92b2a1 100644
--- a/Projects/AnalysisTop/CMakeLists.txt
+++ b/Projects/AnalysisTop/CMakeLists.txt
@@ -21,7 +21,7 @@ find_package( AnalysisBaseExternals REQUIRED )
# Find Python. This is needed because AnalysisBaseExternals sets up
# a wrong value for PYTHONHOME. And nothing in AnalysisBase builds
# against Python to correct it.
-find_package( PythonInterp )
+find_package( Python COMPONENTS Interpreter )
# Add the project's modules directory to CMAKE_MODULE_PATH:
list( INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/modules )
diff --git a/Projects/VP1Light/CMakeLists.txt b/Projects/VP1Light/CMakeLists.txt
index 77b4a153674..b923d66bd63 100644
--- a/Projects/VP1Light/CMakeLists.txt
+++ b/Projects/VP1Light/CMakeLists.txt
@@ -20,7 +20,7 @@ find_package( VP1LightExternals REQUIRED )
# Find Python. This is needed because VP1LightExternals sets up
# a wrong value for PYTHONHOME. And nothing in VP1Light builds
# against Python to correct it.
-find_package( PythonInterp )
+find_package( Python COMPONENTS Interpreter )
find_package( ROOT COMPONENTS Physics Core Tree MathCore Hist RIO pthread
GenVector REQUIRED )
diff --git a/Reconstruction/RecJobTransforms/CMakeLists.txt b/Reconstruction/RecJobTransforms/CMakeLists.txt
index 43f033fb7a6..7171f831265 100644
--- a/Reconstruction/RecJobTransforms/CMakeLists.txt
+++ b/Reconstruction/RecJobTransforms/CMakeLists.txt
@@ -10,9 +10,6 @@ atlas_depends_on_subdirs( PUBLIC
Tools/PyJobTransforms
Tools/PyJobTransformsCore )
-# External dependencies:
-find_package( PythonLibs )
-
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
diff --git a/Simulation/SimuJobTransforms/CMakeLists.txt b/Simulation/SimuJobTransforms/CMakeLists.txt
index 74274ea82ca..c2f199469f0 100644
--- a/Simulation/SimuJobTransforms/CMakeLists.txt
+++ b/Simulation/SimuJobTransforms/CMakeLists.txt
@@ -9,9 +9,6 @@ atlas_subdir( SimuJobTransforms )
atlas_depends_on_subdirs( PUBLIC
Tools/PyJobTransforms )
-# External dependencies:
-find_package( PythonLibs )
-
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
diff --git a/Tools/FullChainTransforms/CMakeLists.txt b/Tools/FullChainTransforms/CMakeLists.txt
index 0260efdfd6c..ec92bf02135 100644
--- a/Tools/FullChainTransforms/CMakeLists.txt
+++ b/Tools/FullChainTransforms/CMakeLists.txt
@@ -12,9 +12,6 @@ atlas_depends_on_subdirs( PUBLIC
Simulation/SimuJobTransforms
Tools/PyJobTransforms )
-# External dependencies:
-find_package( PythonLibs )
-
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
diff --git a/Tools/JobTransforms/CMakeLists.txt b/Tools/JobTransforms/CMakeLists.txt
index d7d8fedbbc6..e26f91c0bd9 100644
--- a/Tools/JobTransforms/CMakeLists.txt
+++ b/Tools/JobTransforms/CMakeLists.txt
@@ -5,5 +5,3 @@
# Declare the package name:
atlas_subdir( JobTransforms )
-# External dependencies:
-find_package( PythonLibs )
diff --git a/Tools/PyJobTransforms/CMakeLists.txt b/Tools/PyJobTransforms/CMakeLists.txt
index ac5258b3502..09ab378aaaa 100644
--- a/Tools/PyJobTransforms/CMakeLists.txt
+++ b/Tools/PyJobTransforms/CMakeLists.txt
@@ -6,7 +6,6 @@
atlas_subdir( PyJobTransforms )
# External dependencies:
-find_package( PythonLibs )
find_package( cx_Oracle )
# Install files from the package:
diff --git a/Tools/PyJobTransformsCore/CMakeLists.txt b/Tools/PyJobTransformsCore/CMakeLists.txt
index c88177c9319..be59de15822 100644
--- a/Tools/PyJobTransformsCore/CMakeLists.txt
+++ b/Tools/PyJobTransformsCore/CMakeLists.txt
@@ -5,9 +5,6 @@
# Declare the package name:
atlas_subdir( PyJobTransformsCore )
-# External dependencies:
-find_package( PythonLibs )
-
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_scripts( share/slimmetadata share/checklog.py share/find_*.py share/trf_ls python/envutil.py )
diff --git a/Tools/PyUtils/CMakeLists.txt b/Tools/PyUtils/CMakeLists.txt
index 8593d7c2f6a..9b1a84ec04d 100644
--- a/Tools/PyUtils/CMakeLists.txt
+++ b/Tools/PyUtils/CMakeLists.txt
@@ -11,7 +11,6 @@ atlas_depends_on_subdirs( PUBLIC
)
# External dependencies:
-find_package( PythonLibs )
find_package( requests )
find_package( six )
find_package( ROOT COMPONENTS Core PyROOT Tree MathCore Hist RIO pthread )
diff --git a/Trigger/TrigConfiguration/TrigConfDBConnection/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfDBConnection/CMakeLists.txt
index a2dc099cd22..92369581755 100644
--- a/Trigger/TrigConfiguration/TrigConfDBConnection/CMakeLists.txt
+++ b/Trigger/TrigConfiguration/TrigConfDBConnection/CMakeLists.txt
@@ -7,7 +7,7 @@ atlas_subdir( TrigConfDBConnection )
# External dependencies:
find_package( Frontier_Client )
-find_package( PythonLibs )
+find_package( Python COMPONENTS Development )
find_package( Boost COMPONENTS filesystem thread system
OPTIONAL_COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} )
diff --git a/Trigger/TrigT1/L1Common/CMakeLists.txt b/Trigger/TrigT1/L1Common/CMakeLists.txt
index acee5bf504f..2fce26ec0dc 100644
--- a/Trigger/TrigT1/L1Common/CMakeLists.txt
+++ b/Trigger/TrigT1/L1Common/CMakeLists.txt
@@ -13,7 +13,7 @@ if( ATLAS_RELEASE_MODE )
endif()
# Find the necessary externals:
-find_package( PythonInterp )
+find_package( Python COMPONENTS Interpreter )
# The generator used to produce header files:
set( _generator ${CMAKE_CURRENT_SOURCE_DIR}/scripts/XMLtoHeader.py )
--
GitLab