diff options
Diffstat (limited to 'sources/pyside6')
| -rw-r--r-- | sources/pyside6/cmake/PySideSetup.cmake | 2 | ||||
| -rw-r--r-- | sources/pyside6/doc/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | sources/pyside6/doc/gettingstarted/linux.rst | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/sources/pyside6/cmake/PySideSetup.cmake b/sources/pyside6/cmake/PySideSetup.cmake index 87a91cfd9..ff2cfbd92 100644 --- a/sources/pyside6/cmake/PySideSetup.cmake +++ b/sources/pyside6/cmake/PySideSetup.cmake @@ -51,7 +51,7 @@ set(BINDING_API_PRE_RELEASE_VERSION "${pyside_PRE_RELEASE_VERSION}") # Detect if the Python interpreter is actually PyPy execute_process( - COMMAND ${PYTHON_EXECUTABLE} -c "if True: + COMMAND ${Python_EXECUTABLE} -c "if True: pypy_version = '' import sys if hasattr(sys, 'pypy_version_info'): diff --git a/sources/pyside6/doc/CMakeLists.txt b/sources/pyside6/doc/CMakeLists.txt index 76f717ee3..8b1c97c21 100644 --- a/sources/pyside6/doc/CMakeLists.txt +++ b/sources/pyside6/doc/CMakeLists.txt @@ -67,7 +67,6 @@ file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/pyside.qdocconf ${CMAKE_CURRENT_LIST_DIR}/ # for the 'build_base_docs' case, and not a full doc build if (NOT FULLDOCSBUILD) find_package(Python COMPONENTS Interpreter) - set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) endif() if (QT_SRC_DIR) @@ -79,7 +78,7 @@ endif() if(PYSIDE_IS_CROSS_BUILD) set(python_executable "${QFP_PYTHON_HOST_PATH}") else() - set(python_executable "${PYTHON_EXECUTABLE}") + set(python_executable "${Python_EXECUTABLE}") endif() set(TOOLS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../tools") @@ -138,7 +137,7 @@ if (FULLDOCSBUILD) file(WRITE ${global_typesystem} "${typeSystemDocXmlContents}") execute_process( - COMMAND ${PYTHON_EXECUTABLE} "${TOOLS_DIR}/doc_modules.py" + COMMAND ${Python_EXECUTABLE} "${TOOLS_DIR}/doc_modules.py" -t "${global_typesystem}" -g "${global_header}" -d "${config_docconf}" "${QT_INCLUDE_DIR}" "${SUPPORTED_QT_VERSION}" OUTPUT_VARIABLE ALL_DOC_MODULES diff --git a/sources/pyside6/doc/gettingstarted/linux.rst b/sources/pyside6/doc/gettingstarted/linux.rst index 111085add..912105ef8 100644 --- a/sources/pyside6/doc/gettingstarted/linux.rst +++ b/sources/pyside6/doc/gettingstarted/linux.rst @@ -86,7 +86,7 @@ Assumming that Qt is in PATH, for example, the configure step can be done with:: cmake -B /path/to/the/build/directory \ -S /path/to/the/pyside-setup \ -DCMAKE_INSTALL_PREFIX=/where/to/install \ - -DPYTHON_EXECUTABLE=/path/to/interpreter + -DPython_EXECUTABLE=/path/to/interpreter .. note:: You can add `-DFORCE_LIMITED_API=yes` in case you want to have a build which will be compatible with Python 3.7+. |
