From 5ca6d10e4495dcc8ac65450aa763e212e0126ce2 Mon Sep 17 00:00:00 2001
From: Massimiliano Galli <massimiliano.galli@cern.ch>
Date: Mon, 30 Mar 2020 13:03:08 +0200
Subject: [PATCH] [CMake][Exp PyROOT] Require Python2 to be 2.7 or higher
The reason is explained in https://sft.its.cern.ch/jira/browse/ROOT-10643
---
cmake/modules/SearchRootCoreDeps.cmake | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/cmake/modules/SearchRootCoreDeps.cmake b/cmake/modules/SearchRootCoreDeps.cmake
index ca40f8cd1f2..e032dc13287 100644
--- a/cmake/modules/SearchRootCoreDeps.cmake
+++ b/cmake/modules/SearchRootCoreDeps.cmake
@@ -46,7 +46,10 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.14)
endif()
find_package(Python2 COMPONENTS Interpreter Development NumPy)
- if(Python2_Development_FOUND)
+ if(DEFINED Python2_VERSION AND "${Python2_VERSION}" VERSION_LESS "2.7")
+ message(WARNING "Ignoring Python2 installation: unsupported version ${Python2_VERSION} (version>=2.7 required)")
+ endif()
+ if(Python2_Development_FOUND AND ${Python2_VERSION} VERSION_GREATER_EQUAL "2.7")
if(NOT Python3_Development_FOUND)
# Only Python2 was found, set as main
set(PYTHON_EXECUTABLE "${Python2_EXECUTABLE}" CACHE INTERNAL "" FORCE)
@@ -72,8 +75,8 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.14)
endif()
endif()
- if(NOT Python3_Development_FOUND AND NOT Python2_Development_FOUND)
- message(FATAL_ERROR "No Python 2 or 3 were found")
+ if(NOT Python3_Development_FOUND AND (NOT Python2_Development_FOUND OR ${Python2_VERSION} VERSION_LESS "2.7"))
+ message(FATAL_ERROR "No supported Python 2 or 3 were found")
endif()
# Print message saying with which versions of Python are used to build
--
GitLab