diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-08 12:51:10 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-04-08 08:51:22 -0400 |
| commit | 261b29bccca74342edcc77bb7b9da1c52bb8c226 (patch) | |
| tree | 39765dd27a4139d2e6da469f16db1908b8a50c0a /Utilities/Sphinx | |
| parent | 073660dfd95dcf0f982916f0ada20e54f5f07b7c (diff) | |
| parent | bf69fa32c4301482fcb3bbfb6733314b9e95c36f (diff) | |
| download | cmake-261b29bccca74342edcc77bb7b9da1c52bb8c226.tar.gz | |
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/Sphinx')
| -rw-r--r-- | Utilities/Sphinx/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt index 5f7e9bfc6e..1259748660 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() |