Commit 86f01c25 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #7307 from Jeroonk:fix_detect_python_majorversion

parents dc3d0cbc 401537eb
...@@ -47,19 +47,24 @@ if(NOT ${found}) ...@@ -47,19 +47,24 @@ 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)
# Copy outputs # Check if python major version is correct
set(_found ${PYTHONINTERP_FOUND}) if(${_preferred_version_major} EQUAL ${PYTHON_VERSION_MAJOR})
set(_executable ${PYTHON_EXECUTABLE}) # Copy outputs
set(_version_string ${PYTHON_VERSION_STRING}) set(_found ${PYTHONINTERP_FOUND})
set(_version_major ${PYTHON_VERSION_MAJOR}) set(_executable ${PYTHON_EXECUTABLE})
set(_version_minor ${PYTHON_VERSION_MINOR}) set(_version_string ${PYTHON_VERSION_STRING})
set(_version_patch ${PYTHON_VERSION_PATCH}) set(_version_major ${PYTHON_VERSION_MAJOR})
set(_version_minor ${PYTHON_VERSION_MINOR})
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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment