Merge topic 'ci-cmake.org-help'

b691906d27 gitlab-ci: Build qthelp-format release documentation for cmake.org
1ceec19c20 gitlab-ci: Add objects.inv to cmake.org html documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7146

.gitlab/artifacts.yml

@@ -116,4 +116,3 @@
             - build/html
         exclude:
             - build/html/.buildinfo
-            - build/html/objects.inv

.gitlab/os-linux.yml

@@ -539,7 +539,9 @@
         - *before_script_linux
         - mkdir -p build/
         - cd build/
-        - cmake ../Utilities/Sphinx -GNinja -DSPHINX_HTML=ON
+        - cmake ../Utilities/Sphinx -GNinja
+          -DSPHINX_HTML=ON
+          -DSPHINX_QTHELP=$CMAKE_CI_SPHINX_QTHELP
           -DCMake_SPHINX_CMAKE_ORG=ON
           -DCMake_SPHINX_CMAKE_ORG_OUTDATED=$CMAKE_CI_SPHINX_OUTDATED
           -DCMake_VERSION_NO_GIT=$CMAKE_CI_VERSION_NO_GIT

.gitlab/rules.yml

@@ -79,16 +79,19 @@
         - if: '$CMAKE_CI_PACKAGE =~ /v[0-9]+\.[0-9]+/'
           variables:
               RSYNC_DESTINATION: "$CMAKE_CI_PACKAGE"
+              CMAKE_CI_SPHINX_QTHELP: "ON"
               CMAKE_CI_VERSION_NO_GIT: "ON"
           when: manual
         - if: '$CMAKE_CI_PROJECT_MAIN_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_MAIN_BRANCH == $CI_COMMIT_BRANCH'
           variables:
               RSYNC_DESTINATION: "git-master"
+              CMAKE_CI_SPHINX_QTHELP: "OFF"
               CMAKE_CI_VERSION_NO_GIT: "OFF"
           when: on_success
         - if: '$CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH == $CI_COMMIT_BRANCH'
           variables:
               RSYNC_DESTINATION: "git-stage"
+              CMAKE_CI_SPHINX_QTHELP: "OFF"
               CMAKE_CI_VERSION_NO_GIT: "OFF"
           when: on_success
         - when: never

Utilities/Sphinx/CMakeLists.txt

@@ -147,6 +147,12 @@ if(CMake_SPHINX_CMAKE_ORG)
   if(CMake_SPHINX_CMAKE_ORG_OUTDATED)
     list(APPEND doc_html_opts -A outdated=1)
   endif()
+
+  list(APPEND qthelp_extra_commands
+    COMMAND ${CMAKE_COMMAND} -E copy
+      "${CMAKE_CURRENT_BINARY_DIR}/qthelp/CMake.qch"
+      "${CMAKE_CURRENT_BINARY_DIR}/html/CMake.qch"
+    )
 endif()
 
 set(doc_format_outputs "")