mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 15:18:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Use FindPython instead of FindPythonInterp to build CMake itself

Browse Source 
Fixes: #23444
This commit is contained in:
Kyle Edwards
2022-04-21 14:08:29 -04:00
parent b6a6190877
commit 313ea361b0
14 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utilities/Release/win/x86/cache-i386.txt
+1 -1
View File
@@ -19,7 +19,7 @@ CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES:STRING=c:/qt-i386/plugins/pl
# Build documentation.
CMAKE_DOC_DIR:STRING=doc/cmake
PYTHON_EXECUTABLE:FILEPATH=C:/python3/python.exe
Python_EXECUTABLE:FILEPATH=C:/python3/python.exe
SPHINX_EXECUTABLE:FILEPATH=C:/python3/Scripts/sphinx-build.exe
SPHINX_HTML:BOOL=ON
SPHINX_MAN:BOOL=ON
Utilities/Release/win/x86/cache-x86_64.txt
+1 -1
View File
@@ -19,7 +19,7 @@ CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES:STRING=c:/qt-x86_64/plugins/
# Build documentation.
CMAKE_DOC_DIR:STRING=doc/cmake
PYTHON_EXECUTABLE:FILEPATH=C:/python3/python.exe
Python_EXECUTABLE:FILEPATH=C:/python3/python.exe
SPHINX_EXECUTABLE:FILEPATH=C:/python3/Scripts/sphinx-build.exe
SPHINX_HTML:BOOL=ON
SPHINX_MAN:BOOL=ON
Utilities/Sphinx/CMakeLists.txt
+2 -2
View File
@@ -101,7 +101,7 @@ if(SPHINX_INFO)
)
endif()
if(SPHINX_QTHELP)
find_package(PythonInterp REQUIRED)
find_package(Python REQUIRED)
find_program(QHELPGENERATOR_EXECUTABLE
NAMES qhelpgenerator-qt5 qhelpgenerator
@@ -124,7 +124,7 @@ if(SPHINX_QTHELP)
# Create proper identifiers. Workaround for
# https://bitbucket.org/birkenfeld/sphinx/issue/1491/qthelp-should-generate-identifiers-for
COMMAND "${PYTHON_EXECUTABLE}"
COMMAND "${Python_EXECUTABLE}"
"${CMAKE_CURRENT_SOURCE_DIR}/create_identifiers.py"
"${CMAKE_CURRENT_BINARY_DIR}/qthelp/"