From 5160d909d394ddd26576f3228f64a26dca90f1cd Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Wed, 1 Jun 2016 12:11:04 +0100 Subject: [PATCH] OpenCVDetectPython.cmake: set minimum python versions This fixes compilation when python is not found or only one version of python is found Signed-off-by: Brendan Le Foll --- cmake/modules/OpenCVDetectPython.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/modules/OpenCVDetectPython.cmake b/cmake/modules/OpenCVDetectPython.cmake index 7b846c9..e3fc3a9 100644 --- a/cmake/modules/OpenCVDetectPython.cmake +++ b/cmake/modules/OpenCVDetectPython.cmake @@ -132,6 +132,9 @@ if(NOT ${found}) endif() endfunction(find_python) +set(MIN_VER_PYTHON2 2.7) +set(MIN_VER_PYTHON3 3.2) + find_python(2.7 "${MIN_VER_PYTHON2}" PYTHON2_LIBRARY PYTHON2_INCLUDE_DIR PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND @@ -146,7 +149,6 @@ find_python(3 "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR PYTHON3_DEBUG_LIBRARIES PYTHON3_LIBRARY_DEBUG PYTHON3_INCLUDE_PATH PYTHON3_INCLUDE_DIR PYTHON3_INCLUDE_DIR2 PYTHON3_PACKAGES_PATH) - if(PYTHON_DEFAULT_EXECUTABLE) set(PYTHON_DEFAULT_AVAILABLE "TRUE") elseif(PYTHON2INTERP_FOUND) # Use Python 2 as default Python interpreter