summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-09-02 13:01:42 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-09-02 13:01:51 (GMT)
commit18a8aa079c72c774d09ae9b18736708f672f972f (patch)
treeba37410422afb736e535308eb1446228c2a13918 /Help
parentd6413056544d14a1f9a1e8867569524a5f765d82 (diff)
parentd0bb3286f022fdb8f0541599fa39efabb9ce2b63 (diff)
downloadCMake-18a8aa079c72c774d09ae9b18736708f672f972f.zip
CMake-18a8aa079c72c774d09ae9b18736708f672f972f.tar.gz
CMake-18a8aa079c72c774d09ae9b18736708f672f972f.tar.bz2
Merge topic 'E-capabilities-tls'
d0bb3286f0 cmake -E capabilities: Tell whether TLS is enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7593
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake.1.rst5
-rw-r--r--Help/release/dev/E-capabilities-tls.rst5
2 files changed, 10 insertions, 0 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index 8cec9d4..2c86299 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -773,6 +773,11 @@ Available commands are:
``true`` if cmake supports server-mode and ``false`` otherwise.
Always false since CMake 3.20.
+ ``tls``
+ .. versionadded:: 3.25
+
+ ``true`` if TLS support is enabled and ``false`` otherwise.
+
.. option:: cat [--] <files>...
.. versionadded:: 3.18
diff --git a/Help/release/dev/E-capabilities-tls.rst b/Help/release/dev/E-capabilities-tls.rst
new file mode 100644
index 0000000..e2324d2
--- /dev/null
+++ b/Help/release/dev/E-capabilities-tls.rst
@@ -0,0 +1,5 @@
+E-capabilities-tls
+------------------
+
+* The :manual:`cmake -E capabilities <cmake(1)>` command gained a new ``tls``
+ field that tells whether or not TLS is enabled.