diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-08 12:51:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-04-08 12:51:22 (GMT) |
| commit | 261b29bccca74342edcc77bb7b9da1c52bb8c226 (patch) | |
| tree | 39765dd27a4139d2e6da469f16db1908b8a50c0a /Utilities/Release | |
| parent | 073660dfd95dcf0f982916f0ada20e54f5f07b7c (diff) | |
| parent | bf69fa32c4301482fcb3bbfb6733314b9e95c36f (diff) | |
| download | CMake-261b29bccca74342edcc77bb7b9da1c52bb8c226.zip CMake-261b29bccca74342edcc77bb7b9da1c52bb8c226.tar.gz CMake-261b29bccca74342edcc77bb7b9da1c52bb8c226.tar.bz2 | |
Merge topic 'doc-qhelpgenerator'
bf69fa32c4 Utilities/Sphinx: Update qthelp generation to qhelpgenerator
37904abb58 Help: Add "Updates" section header in 3.22 release notes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7150
Diffstat (limited to 'Utilities/Release')
| -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 |
4 files changed, 4 insertions, 4 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 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 |