From: Bastian Stender Date: Fri, 26 Jan 2018 14:27:23 +0100 Subject: [PATCH] cmake: allow specifying the preferred Python3 version Signed-off-by: Bastian Stender --- cmake/Modules/FindPython3Interp.cmake | 4 ++-- cmake/Modules/FindPython3Libs.cmake | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/FindPython3Interp.cmake b/cmake/Modules/FindPython3Interp.cmake index 373982e210a3..ad38c6697bc8 100644 --- a/cmake/Modules/FindPython3Interp.cmake +++ b/cmake/Modules/FindPython3Interp.cmake @@ -20,7 +20,7 @@ # License text for the above reference.) FIND_PROGRAM(PYTHON3_EXECUTABLE - NAMES python3.2mu python3.2m python3.2u python3.2 python3.1 python3.0 python3 + NAMES ${Python3_PREFERRED_VERSION} python3.2mu python3.2m python3.2u python3.2 python3.1 python3.0 python3 PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.2\\InstallPath] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.1\\InstallPath] @@ -28,7 +28,7 @@ FIND_PROGRAM(PYTHON3_EXECUTABLE ) FIND_PROGRAM(PYTHON3_DBG_EXECUTABLE - NAMES python3.2dmu python3.2dm python3.2du python3.2d python3.1-dbg python3.0-dbg python3-dbg + NAMES ${Python3_PREFERRED_VERSION} python3.2dmu python3.2dm python3.2du python3.2d python3.1-dbg python3.0-dbg python3-dbg PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.2\\InstallPath] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\3.1\\InstallPath] diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs.cmake index 20a82ba07d59..e1789438a4b9 100644 --- a/cmake/Modules/FindPython3Libs.cmake +++ b/cmake/Modules/FindPython3Libs.cmake @@ -27,7 +27,9 @@ INCLUDE(CMakeFindFrameworks) # Search for the python framework on Apple. # CMAKE_FIND_FRAMEWORKS(Python) -FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0) +STRING(REPLACE "python" "" Python3_PREFERRED_VERSION_NUMBER ${Python3_PREFERRED_VERSION}) + +FOREACH(_CURRENT_VERSION ${Python3_PREFERRED_VERSION_NUMBER} 3.4 3.3 3.2 3.1 3.0) IF(_CURRENT_VERSION GREATER 3.1) SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "") ELSE()