summaryrefslogtreecommitdiffstats
path: root/.gitlab/os-linux.yml
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-04-06 17:02:24 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-04-06 17:02:38 (GMT)
commit5c429c5b405681b3d148a2b26f76b54d914a94b2 (patch)
treea4e1988c37ca20ab4cd4f5b44259f2be6d9f97c1 /.gitlab/os-linux.yml
parentc508935dad210a19b3a2eb4b78f1dddac5efe6dc (diff)
parentb691906d271e2cb3dba09ef8ec07d05278976257 (diff)
downloadCMake-5c429c5b405681b3d148a2b26f76b54d914a94b2.zip
CMake-5c429c5b405681b3d148a2b26f76b54d914a94b2.tar.gz
CMake-5c429c5b405681b3d148a2b26f76b54d914a94b2.tar.bz2
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
Diffstat (limited to '.gitlab/os-linux.yml')
-rw-r--r--.gitlab/os-linux.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 1a13c3a..60a11b0 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