From 37904abb58fce06c34919484b2d6c470f204b2d6 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Apr 2022 09:32:17 -0400 Subject: Help: Add "Updates" section header in 3.22 release notes This was accidentally left out in commit 1461eff899 (Help: Add missing 3.22.1 section to the release notes, 2022-01-24, v3.22.2~1^2). --- Help/release/3.22.rst | 5 +++++ 1 file changed, 5 insertions(+) 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 ------ -- cgit v0.12 From bf69fa32c4301482fcb3bbfb6733314b9e95c36f Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Apr 2022 09:37:06 -0400 Subject: Utilities/Sphinx: Update qthelp generation to qhelpgenerator `qcollectiongenerator` is deprecated in favor of `qhelpgenerator`. --- Utilities/Release/linux/aarch64/cache.txt | 2 +- Utilities/Release/linux/x86_64/cache.txt | 2 +- Utilities/Release/win/x86/cache-i386.txt | 2 +- Utilities/Release/win/x86/cache-x86_64.txt | 2 +- Utilities/Sphinx/CMakeLists.txt | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) 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 54a45d8..1c5c7f9 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 0b78c72..1c9b14c 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 402c7c6..981e554 100644 --- a/Utilities/Sphinx/CMakeLists.txt +++ b/Utilities/Sphinx/CMakeLists.txt @@ -102,12 +102,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) @@ -127,7 +127,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() -- cgit v0.12