diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-06 17:02:24 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-04-06 13:02:38 -0400 |
| commit | 5c429c5b405681b3d148a2b26f76b54d914a94b2 (patch) | |
| tree | a4e1988c37ca20ab4cd4f5b44259f2be6d9f97c1 | |
| parent | c508935dad210a19b3a2eb4b78f1dddac5efe6dc (diff) | |
| parent | b691906d271e2cb3dba09ef8ec07d05278976257 (diff) | |
| download | cmake-5c429c5b405681b3d148a2b26f76b54d914a94b2.tar.gz | |
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
| -rw-r--r-- | .gitlab/artifacts.yml | 1 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 4 | ||||
| -rw-r--r-- | .gitlab/rules.yml | 3 | ||||
| -rw-r--r-- | Utilities/Sphinx/CMakeLists.txt | 6 |
4 files changed, 12 insertions, 2 deletions
diff --git a/.gitlab/artifacts.yml b/.gitlab/artifacts.yml index 982f50b3bd..5472c0ace9 100644 --- a/.gitlab/artifacts.yml +++ b/.gitlab/artifacts.yml @@ -116,4 +116,3 @@ - build/html exclude: - build/html/.buildinfo - - build/html/objects.inv diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 1a13c3a7a2..60a11b07a1 100644 --- a/.gitlab/os-linux.yml +++ b/.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 diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml index d5f8795896..8efa3040f7 100644 --- a/.gitlab/rules.yml +++ b/.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 diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt index 2eba0607db..5f7e9bfc6e 100644 --- a/Utilities/Sphinx/CMakeLists.txt +++ b/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 "") |