From dbb684b85f511f791db6d20d0523a5321bf48079 Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Fri, 23 Aug 2013 18:31:51 +0400 Subject: [PATCH] Bumped minimal Python version to 2.6. Rationale: we already depend on it (e.g. some scripts use print_function). --- cmake/OpenCVDetectPython.cmake | 4 ++-- cmake/OpenCVMinDepVersions.cmake | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake index ca693e7..fa88ba0 100644 --- a/cmake/OpenCVDetectPython.cmake +++ b/cmake/OpenCVDetectPython.cmake @@ -2,7 +2,7 @@ if(WIN32 AND NOT PYTHON_EXECUTABLE) # search for executable with the same bitness as resulting binaries # standard FindPythonInterp always prefers executable from system path # this is really important because we are using the interpreter for numpy search and for choosing the install location - foreach(_CURRENT_VERSION ${Python_ADDITIONAL_VERSIONS} 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) + foreach(_CURRENT_VERSION ${Python_ADDITIONAL_VERSIONS} 2.7 "${MIN_VER_PYTHON}") find_host_program(PYTHON_EXECUTABLE NAMES python${_CURRENT_VERSION} python PATHS @@ -12,7 +12,7 @@ if(WIN32 AND NOT PYTHON_EXECUTABLE) ) endforeach() endif() -find_host_package(PythonInterp 2.0) +find_host_package(PythonInterp "${MIN_VER_PYTHON}") unset(HAVE_SPHINX CACHE) diff --git a/cmake/OpenCVMinDepVersions.cmake b/cmake/OpenCVMinDepVersions.cmake index 9ec40d9..b659a83 100644 --- a/cmake/OpenCVMinDepVersions.cmake +++ b/cmake/OpenCVMinDepVersions.cmake @@ -1,2 +1,3 @@ set(MIN_VER_CMAKE 2.8.7) +set(MIN_VER_PYTHON 2.6) set(MIN_VER_ZLIB 1.2.3) -- 2.7.4