diff options
-rw-r--r-- | Help/release/3.22.rst | 5 | ||||
-rw-r--r-- | Utilities/Release/linux/aarch64/cache.txt | 2 | ||||
-rw-r--r-- | Utilities/Release/linux/x86_64/cache.txt | 2 | ||||
-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 | 12 |
6 files changed, 15 insertions, 10 deletions
diff --git a/Help/release/3.22.rst b/Help/release/3.22.rst index 1f773e6..efac925 100644 --- a/Help/release/3.22.rst +++ b/Help/release/3.22.rst @@ -143,6 +143,11 @@ Other Changes * The :cpack_gen:`CPack NSIS Generator` now requires NSIS 3.03 or later. +Updates +======= + +Changes made since CMake 3.22.0 include the following. + 3.22.1 ------ diff --git a/Utilities/Release/linux/aarch64/cache.txt b/Utilities/Release/linux/aarch64/cache.txt index 0c2d995..ebfed73 100644 --- a/Utilities/Release/linux/aarch64/cache.txt +++ b/Utilities/Release/linux/aarch64/cache.txt @@ -32,7 +32,7 @@ SPHINX_EXECUTABLE:FILEPATH=/usr/local/bin/sphinx-build SPHINX_HTML:BOOL=ON SPHINX_MAN:BOOL=ON SPHINX_QTHELP:BOOL=ON -QCOLLECTIONGENERATOR_EXECUTABLE:PATH=/opt/qt/bin/qhelpgenerator +QHELPGENERATOR_EXECUTABLE:PATH=/opt/qt/bin/qhelpgenerator # We bootstrap as part of the build so skip its test. CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE diff --git a/Utilities/Release/linux/x86_64/cache.txt b/Utilities/Release/linux/x86_64/cache.txt index e1f9fe3..a422af3 100644 --- a/Utilities/Release/linux/x86_64/cache.txt +++ b/Utilities/Release/linux/x86_64/cache.txt @@ -32,7 +32,7 @@ SPHINX_EXECUTABLE:FILEPATH=/opt/rh/rh-python36/root/usr/bin/sphinx-build SPHINX_HTML:BOOL=ON SPHINX_MAN:BOOL=ON SPHINX_QTHELP:BOOL=ON -QCOLLECTIONGENERATOR_EXECUTABLE:PATH=/opt/qt/bin/qhelpgenerator +QHELPGENERATOR_EXECUTABLE:PATH=/opt/qt/bin/qhelpgenerator # We bootstrap as part of the build so skip its test. CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE diff --git a/Utilities/Release/win/x86/cache-i386.txt b/Utilities/Release/win/x86/cache-i386.txt index 2dcd4dd..31c89ce 100644 --- a/Utilities/Release/win/x86/cache-i386.txt +++ b/Utilities/Release/win/x86/cache-i386.txt @@ -24,7 +24,7 @@ SPHINX_EXECUTABLE:FILEPATH=C:/python3/Scripts/sphinx-build.exe SPHINX_HTML:BOOL=ON SPHINX_MAN:BOOL=ON SPHINX_QTHELP:BOOL=ON -QCOLLECTIONGENERATOR_EXECUTABLE:PATH=C:/qt-i386/bin/qhelpgenerator.exe +QHELPGENERATOR_EXECUTABLE:PATH=C:/qt-i386/bin/qhelpgenerator.exe # No bootstrap with MSVC tools. CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE diff --git a/Utilities/Release/win/x86/cache-x86_64.txt b/Utilities/Release/win/x86/cache-x86_64.txt index 3c5593e..b1e8dc1 100644 --- a/Utilities/Release/win/x86/cache-x86_64.txt +++ b/Utilities/Release/win/x86/cache-x86_64.txt @@ -24,7 +24,7 @@ SPHINX_EXECUTABLE:FILEPATH=C:/python3/Scripts/sphinx-build.exe SPHINX_HTML:BOOL=ON SPHINX_MAN:BOOL=ON SPHINX_QTHELP:BOOL=ON -QCOLLECTIONGENERATOR_EXECUTABLE:PATH=C:/qt-x86_64/bin/qhelpgenerator.exe +QHELPGENERATOR_EXECUTABLE:PATH=C:/qt-x86_64/bin/qhelpgenerator.exe # No bootstrap with MSVC tools. CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt index 7fac863..d2bfb61 100644 --- a/Utilities/Sphinx/CMakeLists.txt +++ b/Utilities/Sphinx/CMakeLists.txt @@ -103,12 +103,12 @@ endif() if(SPHINX_QTHELP) find_package(PythonInterp REQUIRED) - find_program(QCOLLECTIONGENERATOR_EXECUTABLE - NAMES qcollectiongenerator-qt5 qcollectiongenerator - DOC "qcollectiongenerator tool" + find_program(QHELPGENERATOR_EXECUTABLE + NAMES qhelpgenerator-qt5 qhelpgenerator + DOC "qhelpgenerator tool" ) - if (NOT QCOLLECTIONGENERATOR_EXECUTABLE) - message(FATAL_ERROR "QCOLLECTIONGENERATOR_EXECUTABLE (qcollectiongenerator) not found!") + if(NOT QHELPGENERATOR_EXECUTABLE) + message(FATAL_ERROR "QHELPGENERATOR_EXECUTABLE (qhelpgenerator) not found!") endif() list(APPEND doc_formats qthelp) @@ -128,7 +128,7 @@ if(SPHINX_QTHELP) "${CMAKE_CURRENT_SOURCE_DIR}/create_identifiers.py" "${CMAKE_CURRENT_BINARY_DIR}/qthelp/" - COMMAND ${QCOLLECTIONGENERATOR_EXECUTABLE} + COMMAND ${QHELPGENERATOR_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake.qhcp ) endif() |