diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-08 12:05:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-08 12:06:03 (GMT) |
| commit | 88874144323383049e368f771d95471176018b9f (patch) | |
| tree | 5b1c50e083bab5c1789a089beb1387a53306053b /Utilities | |
| parent | 5c9d0905e7ab541d6e59288861b58a208f2e7ed4 (diff) | |
| parent | 50cbc9b77a7df57f2616fe2c4f5e6778f00f1cf8 (diff) | |
| download | CMake-88874144323383049e368f771d95471176018b9f.zip CMake-88874144323383049e368f771d95471176018b9f.tar.gz CMake-88874144323383049e368f771d95471176018b9f.tar.bz2 | |
Merge topic 'gitlab-ci-sphinx'
50cbc9b77a gitlab-ci: add a sphinx builder
d78bf2f229 ci: install sphinx into the CI image
671ff5f1ac ci: skip weak dependencies in the CI image
bdce0fc317 CTestCustom: fix indentation
e4f398e0af Help: add alt text to embedded images
758ab4dbd3 Utilities/Sphinx: allow CDash submission for the standalone build
16de8e3544 Utilities/Sphinx: support finding Qt5's qcollectiongenerator too
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4713
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/Sphinx/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Utilities/Sphinx/CTestConfig.cmake | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt index 17c5018..e5be43a 100644 --- a/Utilities/Sphinx/CMakeLists.txt +++ b/Utilities/Sphinx/CMakeLists.txt @@ -89,7 +89,7 @@ if(SPHINX_QTHELP) find_package(PythonInterp REQUIRED) find_program(QCOLLECTIONGENERATOR_EXECUTABLE - NAMES qcollectiongenerator + NAMES qcollectiongenerator-qt5 qcollectiongenerator DOC "qcollectiongenerator tool" ) if (NOT QCOLLECTIONGENERATOR_EXECUTABLE) diff --git a/Utilities/Sphinx/CTestConfig.cmake b/Utilities/Sphinx/CTestConfig.cmake new file mode 100644 index 0000000..9607e38 --- /dev/null +++ b/Utilities/Sphinx/CTestConfig.cmake @@ -0,0 +1,14 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# file Copyright.txt or https://cmake.org/licensing for details. + +# If changing this file, also update CTestConfig.cmake + +set(CTEST_PROJECT_NAME "CMake") +set(CTEST_NIGHTLY_START_TIME "1:00:00 UTC") + +set(CTEST_DROP_METHOD "http") +set(CTEST_DROP_SITE "open.cdash.org") +set(CTEST_DROP_LOCATION "/submit.php?project=CMake") +set(CTEST_DROP_SITE_CDASH TRUE) +set(CTEST_CDASH_VERSION "1.6") +set(CTEST_CDASH_QUERY_VERSION TRUE) |