summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-02-08 16:44:44 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-02-08 16:44:57 (GMT)
commit61f271f6ed7b5a68d24df28f5d2e3e743240e6d9 (patch)
tree68dcf87121513189bad086a0f4af77d3cd2a4577
parent398844667b2d709db5701150f967f20cb94b8a86 (diff)
parent6789af36bf14b7c146b26e9c80a6edcc2fd71089 (diff)
downloadCMake-61f271f6ed7b5a68d24df28f5d2e3e743240e6d9.zip
CMake-61f271f6ed7b5a68d24df28f5d2e3e743240e6d9.tar.gz
CMake-61f271f6ed7b5a68d24df28f5d2e3e743240e6d9.tar.bz2
Merge topic 'feature/sphinx-linkcheck'
6789af36bf Help: Fix broken links found by `linkcheck` 8f4bd3bf7e ci: Check for broken links when build HTML manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8177
-rw-r--r--.gitlab/ci/configure_sphinx.cmake3
-rw-r--r--Help/cpack_gen/nuget.rst4
2 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab/ci/configure_sphinx.cmake b/.gitlab/ci/configure_sphinx.cmake
index 3750309..9f3f0be 100644
--- a/.gitlab/ci/configure_sphinx.cmake
+++ b/.gitlab/ci/configure_sphinx.cmake
@@ -4,3 +4,6 @@ set(SPHINX_HTML ON CACHE BOOL "")
set(SPHINX_SINGLEHTML ON CACHE BOOL "")
set(SPHINX_QTHELP ON CACHE BOOL "")
set(SPHINX_TEXT ON CACHE BOOL "")
+if(NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "")
+ set(SPHINX_LINKCHECK ON CACHE BOOL "")
+endif()
diff --git a/Help/cpack_gen/nuget.rst b/Help/cpack_gen/nuget.rst
index 1f2e762..8ee2816 100644
--- a/Help/cpack_gen/nuget.rst
+++ b/Help/cpack_gen/nuget.rst
@@ -258,7 +258,7 @@ List of CPack NuGet generator specific variables:
.. _nuget.org: https://www.nuget.org
.. _version specification: https://learn.microsoft.com/en-us/nuget/concepts/package-versioning#version-ranges
-.. _SPDX license identifier: https://spdx.github.io/spdx-spec/SPDX-license-list
-.. _SPDX specification: https://spdx.github.io/spdx-spec/SPDX-license-expressions
+.. _SPDX license identifier: https://spdx.org/licenses
+.. _SPDX specification: https://spdx.github.io/spdx-spec/v2.3/SPDX-license-expressions
.. NuGet spec docs https://docs.microsoft.com/en-us/nuget/reference/nuspec