From 16de8e35446a81de7f4c13867cade0283df64f75 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 5 May 2020 12:09:40 -0400 Subject: Utilities/Sphinx: support finding Qt5's qcollectiongenerator too --- Utilities/Sphinx/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v0.12 From 758ab4dbd3f279f517fbcce89697ab780cc73347 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 5 May 2020 12:16:19 -0400 Subject: Utilities/Sphinx: allow CDash submission for the standalone build --- CTestConfig.cmake | 2 ++ Utilities/Sphinx/CTestConfig.cmake | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 Utilities/Sphinx/CTestConfig.cmake diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 020582e..9ec9e8f 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -1,6 +1,8 @@ # 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 Utilities/Sphinx/CTestConfig.cmake + set(CTEST_PROJECT_NAME "CMake") set(CTEST_NIGHTLY_START_TIME "1:00:00 UTC") 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) -- cgit v0.12 From e4f398e0afe1e16c493bad3033313d8b3980eabc Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 5 May 2020 13:39:35 -0400 Subject: Help: add alt text to embedded images --- Help/guide/user-interaction/index.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Help/guide/user-interaction/index.rst b/Help/guide/user-interaction/index.rst index 3a1038f..c724b6f 100644 --- a/Help/guide/user-interaction/index.rst +++ b/Help/guide/user-interaction/index.rst @@ -86,6 +86,7 @@ populated. It is always advised to use different directories for the source and the build. .. image:: /guide/user-interaction/GUI-Source-Binary.png + :alt: Choosing source and binary directories Generating a Buildsystem ======================== @@ -246,16 +247,19 @@ The "Configure" button triggers a new dialog to select the CMake generator to use. .. image:: /guide/user-interaction/GUI-Configure-Dialog.png + :alt: Configuring a generator All generators available on the command line are also available in :manual:`cmake-gui(1)`. .. image:: /guide/user-interaction/GUI-Choose-Generator.png + :alt: Choosing a generator When choosing a Visual Studio generator, further options are available to set an architecture to generate for. .. image:: /manual/VS-Choose-Arch.png + :alt: Choosing an architecture for Visual Studio generators .. _`Setting Build Variables`: @@ -356,6 +360,7 @@ button. This triggers a new dialog to set the value of the variable. .. image:: /guide/user-interaction/GUI-Add-Entry.png + :alt: Editing a cache entry The main view of the :manual:`cmake-gui(1)` user interface can be used to edit existing variables. -- cgit v0.12 From bdce0fc31746df4bbd36b5ce6d11e564e04d2452 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 5 May 2020 13:37:01 -0400 Subject: CTestCustom: fix indentation --- CTestCustom.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in index c3f3b7c..622f054 100644 --- a/CTestCustom.cmake.in +++ b/CTestCustom.cmake.in @@ -80,7 +80,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION "compilation completed with warnings" # PGI "[0-9]+ Warning\\(s\\) detected" # SunPro -# scanbuild exceptions + # scanbuild exceptions "char_traits.h:.*: warning: Null pointer argument in call to string length function" "stl_construct.h:.*: warning: Forming reference to null pointer" ".*stl_uninitialized.h:75:19: warning: Forming reference to null pointer.*" -- cgit v0.12 From 671ff5f1ac06cca1460a0c4c729a347660cc4f08 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 5 May 2020 11:17:01 -0400 Subject: ci: skip weak dependencies in the CI image --- .gitlab/ci/docker/fedora31/install_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/ci/docker/fedora31/install_deps.sh b/.gitlab/ci/docker/fedora31/install_deps.sh index 978fdbd..cf8f359 100755 --- a/.gitlab/ci/docker/fedora31/install_deps.sh +++ b/.gitlab/ci/docker/fedora31/install_deps.sh @@ -5,7 +5,7 @@ dnf install -y \ openssl-devel # Install development tools. -dnf install -y \ +dnf install --setopt=install_weak_deps=False -y \ clang-tools-extra \ gcc-c++ \ git-core -- cgit v0.12 From d78bf2f229d6e22ab2ad76fe8256532d009b70df Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 5 May 2020 11:17:17 -0400 Subject: ci: install sphinx into the CI image --- .gitlab/ci/docker/fedora31/install_deps.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab/ci/docker/fedora31/install_deps.sh b/.gitlab/ci/docker/fedora31/install_deps.sh index cf8f359..7f8da57 100755 --- a/.gitlab/ci/docker/fedora31/install_deps.sh +++ b/.gitlab/ci/docker/fedora31/install_deps.sh @@ -10,4 +10,10 @@ dnf install --setopt=install_weak_deps=False -y \ gcc-c++ \ git-core +# Install documentation tools. +dnf install --setopt=install_weak_deps=False -y \ + python3-sphinx \ + texinfo \ + qt5-qttools-devel + dnf clean all -- cgit v0.12 From 50cbc9b77a7df57f2616fe2c4f5e6778f00f1cf8 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 5 May 2020 11:18:48 -0400 Subject: gitlab-ci: add a sphinx builder --- .gitlab-ci.yml | 29 ++++++++++++++++++++++++++++- .gitlab/ci/configure_fedora31_sphinx.cmake | 8 ++++++++ .gitlab/ci/gitlab_ci.cmake | 3 +++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 .gitlab/ci/configure_fedora31_sphinx.cmake diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a91d20..2ac075a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ - tags@cmake/cmake .fedora31: &fedora31 - image: "kitware/cmake:ci-fedora31-x86_64-2020-04-27" + image: "kitware/cmake:ci-fedora31-x86_64-2020-05-05" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/gitlab-kitware-cmake ci" @@ -29,6 +29,14 @@ CMAKE_CONFIGURATION: fedora31_tidy CTEST_NO_WARNINGS_ALLOWED: 1 +.fedora31_sphinx: &fedora31_sphinx + extends: .fedora31 + + variables: + CMAKE_CONFIGURATION: fedora31_sphinx + CTEST_NO_WARNINGS_ALLOWED: 1 + CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" + before_script: - .gitlab/ci/cmake.sh - .gitlab/ci/ninja.sh @@ -95,3 +103,22 @@ build:fedora31-tidy: - "$LAUNCHER ctest -VV -S .gitlab/ci/ctest_build.cmake" - sccache --show-stats interruptible: true + +build:fedora31-sphinx: + <<: + - *fedora31_sphinx + stage: build + only: *only_settings + tags: + - build + - docker + - linux + + script: + - .gitlab/ci/sccache.sh + - sccache --start-server + - sccache --show-stats + - "$LAUNCHER ctest -VV -S .gitlab/ci/ctest_configure.cmake" + - "$LAUNCHER ctest -VV -S .gitlab/ci/ctest_build.cmake" + - sccache --show-stats + interruptible: true diff --git a/.gitlab/ci/configure_fedora31_sphinx.cmake b/.gitlab/ci/configure_fedora31_sphinx.cmake new file mode 100644 index 0000000..dfc9b8c --- /dev/null +++ b/.gitlab/ci/configure_fedora31_sphinx.cmake @@ -0,0 +1,8 @@ +set(SPHINX_INFO ON CACHE BOOL "") +set(SPHINX_MAN ON CACHE BOOL "") +set(SPHINX_HTML ON CACHE BOOL "") +set(SPHINX_SINGLEHTML ON CACHE BOOL "") +set(SPHINX_QTHELP ON CACHE BOOL "") +set(SPHINX_TEXT ON CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/gitlab_ci.cmake b/.gitlab/ci/gitlab_ci.cmake index 401cc40..b49f51d 100644 --- a/.gitlab/ci/gitlab_ci.cmake +++ b/.gitlab/ci/gitlab_ci.cmake @@ -5,6 +5,9 @@ endif () # Set up the source and build paths. set(CTEST_SOURCE_DIRECTORY "$ENV{CI_PROJECT_DIR}") +if (NOT "$ENV{CTEST_SOURCE_SUBDIRECTORY}" STREQUAL "") + string(APPEND CTEST_SOURCE_DIRECTORY "/$ENV{CTEST_SOURCE_SUBDIRECTORY}") +endif () set(CTEST_BINARY_DIRECTORY "${CTEST_SOURCE_DIRECTORY}/build") if ("$ENV{CMAKE_CONFIGURATION}" STREQUAL "") -- cgit v0.12