diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2022-04-21 18:08:29 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2022-04-21 18:23:36 (GMT) |
| commit | 313ea361b0435b18e89fb652bf59a8aef25a066b (patch) | |
| tree | d0a6ea4e46ab2e64cfe81518b0cb7497e94efc1a /Utilities | |
| parent | b6a6190877ebc6098fd01fe34dcd4cca39e1f182 (diff) | |
| download | CMake-313ea361b0435b18e89fb652bf59a8aef25a066b.zip CMake-313ea361b0435b18e89fb652bf59a8aef25a066b.tar.gz CMake-313ea361b0435b18e89fb652bf59a8aef25a066b.tar.bz2 | |
CMake: Use FindPython instead of FindPythonInterp to build CMake itself
Fixes: #23444
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/Release/win/x86/cache-i386.txt | 2 | ||||
| -rw-r--r-- | Utilities/Release/win/x86/cache-x86_64.txt | 2 | ||||
| -rw-r--r-- | Utilities/Sphinx/CMakeLists.txt | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Utilities/Release/win/x86/cache-i386.txt b/Utilities/Release/win/x86/cache-i386.txt index 31c89ce..7f58fdd 100644 --- a/Utilities/Release/win/x86/cache-i386.txt +++ b/Utilities/Release/win/x86/cache-i386.txt @@ -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 diff --git a/Utilities/Release/win/x86/cache-x86_64.txt b/Utilities/Release/win/x86/cache-x86_64.txt index b1e8dc1..d034640 100644 --- a/Utilities/Release/win/x86/cache-x86_64.txt +++ b/Utilities/Release/win/x86/cache-x86_64.txt @@ -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 diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt index 1259748..c698e3b 100644 --- a/Utilities/Sphinx/CMakeLists.txt +++ b/Utilities/Sphinx/CMakeLists.txt @@ -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/" |