1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Mon, 6 Apr 2020 16:59:26 +0200
Subject: Allow to specify the used Python version
---
cmake/sip_helper.cmake | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/cmake/sip_helper.cmake b/cmake/sip_helper.cmake
index 0b07eb2..3094515 100644
--- a/cmake/sip_helper.cmake
+++ b/cmake/sip_helper.cmake
@@ -5,10 +5,13 @@ set(__PYTHON_QT_BINDING_SIP_HELPER_INCLUDED TRUE)
set(__PYTHON_QT_BINDING_SIP_HELPER_DIR ${CMAKE_CURRENT_LIST_DIR})
-set(Python_ADDITIONAL_VERSIONS "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
-find_package(PythonInterp "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" REQUIRED)
+if(NOT PYBUILD_PYTHON_VERSION)
+set(PYBUILD_PYTHON_VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
+endif()
+set(Python_ADDITIONAL_VERSIONS ${PYBUILD_PYTHON_VERSION})
+find_package(PythonInterp ${PYBUILD_PYTHON_VERSION} EXACT REQUIRED)
assert(PYTHON_EXECUTABLE)
-find_package(PythonLibs "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" REQUIRED)
+find_package(PythonLibs ${PYBUILD_PYTHON_VERSION} EXACT REQUIRED)
execute_process(
COMMAND ${PYTHON_EXECUTABLE} -c "import sipconfig; print(sipconfig.Configuration().sip_bin)"
|