mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-30 01:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7307 from Jeroonk:fix_detect_python_majorversion

Browse Source
This commit is contained in:
Alexander Alekhin 2016-09-19 12:23:06 +00:00
commit 86f01c254d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/OpenCVDetectPython.cmake
View File

@ -47,12 +47,16 @@ if(NOT ${found})
endforeach() endforeach()
endif() endif()
string(REGEX MATCH "^[0-9]+" _preferred_version_major ${preferred_version})
find_host_package(PythonInterp "${preferred_version}") find_host_package(PythonInterp "${preferred_version}")
if(NOT PYTHONINTERP_FOUND) if(NOT PYTHONINTERP_FOUND)
find_host_package(PythonInterp "${min_version}") find_host_package(PythonInterp "${min_version}")
endif() endif()
if(PYTHONINTERP_FOUND) if(PYTHONINTERP_FOUND)
# Check if python major version is correct
if(${_preferred_version_major} EQUAL ${PYTHON_VERSION_MAJOR})
# Copy outputs # Copy outputs
set(_found ${PYTHONINTERP_FOUND}) set(_found ${PYTHONINTERP_FOUND})
set(_executable ${PYTHON_EXECUTABLE}) set(_executable ${PYTHON_EXECUTABLE})
@ -60,6 +64,7 @@ if(NOT ${found})
set(_version_major ${PYTHON_VERSION_MAJOR}) set(_version_major ${PYTHON_VERSION_MAJOR})
set(_version_minor ${PYTHON_VERSION_MINOR}) set(_version_minor ${PYTHON_VERSION_MINOR})
set(_version_patch ${PYTHON_VERSION_PATCH}) set(_version_patch ${PYTHON_VERSION_PATCH})
endif()
# Clear find_host_package side effects # Clear find_host_package side effects
unset(PYTHONINTERP_FOUND) unset(PYTHONINTERP_FOUND)