diff options
author | Brad King <brad.king@kitware.com> | 2022-11-08 14:01:43 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-08 14:02:31 (GMT) |
commit | dab81ced1b063aad93f62f41d8ba15229a56f77d (patch) | |
tree | 4569c6e3cd4a72833f30419a2817635163555c22 /Help/manual | |
parent | 07b9e2daf2c1a200ba19cf44270e09dc9357c3eb (diff) | |
parent | a89c76a77377179fc7baab5755bb38793b4bac14 (diff) | |
download | CMake-dab81ced1b063aad93f62f41d8ba15229a56f77d.zip CMake-dab81ced1b063aad93f62f41d8ba15229a56f77d.tar.gz CMake-dab81ced1b063aad93f62f41d8ba15229a56f77d.tar.bz2 |
Merge topic 'sphinx-linkcheck'
a89c76a773 Build: Add `SPHINX_LINKCHECK` build option
137b00cda1 Build: Do not redirect `sphinx-build` output if CMake running in verbose mode
d954fb8a60 Build: Deduplicate `add_custom_command()` calls for Sphinx targets
2af8724485 Merge branch 'backport-sphinx-linkcheck' into sphinx-linkcheck
435b0c573c Help: Fix some redirects reported with sphinx linkcheck
ac5295a9de Help: Fix broken external links found by sphinx linkcheck
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7876
Diffstat (limited to 'Help/manual')
-rw-r--r-- | Help/manual/cmake-language.7.rst | 2 | ||||
-rw-r--r-- | Help/manual/cmake-qt.7.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Help/manual/cmake-language.7.rst b/Help/manual/cmake-language.7.rst index 16917ff..0bd561f 100644 --- a/Help/manual/cmake-language.7.rst +++ b/Help/manual/cmake-language.7.rst @@ -74,7 +74,7 @@ encoded in UTF-8 on Windows (using UTF-16 to call system APIs). Furthermore, CMake 3.0 and above allow a leading UTF-8 `Byte-Order Mark`_ in source files. -.. _`Byte-Order Mark`: http://en.wikipedia.org/wiki/Byte_order_mark +.. _Byte-Order Mark: https://en.wikipedia.org/wiki/Byte_order_mark Source Files ------------ diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst index f156f95..d0d6ea0 100644 --- a/Help/manual/cmake-qt.7.rst +++ b/Help/manual/cmake-qt.7.rst @@ -14,7 +14,7 @@ CMake can find and use Qt 4 and Qt 5 libraries. The Qt 4 libraries are found by the :module:`FindQt4` find-module shipped with CMake, whereas the Qt 5 libraries are found using "Config-file Packages" shipped with Qt 5. See :manual:`cmake-packages(7)` for more information about CMake packages, and -see `the Qt cmake manual <http://qt-project.org/doc/qt-5/cmake-manual.html>`_ +see `the Qt cmake manual <https://contribute.qt-project.org/doc/qt-5/cmake-manual.html>`_ for your Qt version. Qt 4 and Qt 5 may be used together in the same |