summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-06-12 15:42:44 (GMT)
committerBrad King <brad.king@kitware.com>2019-06-12 15:42:44 (GMT)
commitfa00a3b29bdc962429af13c64f11b51fee8c58bb (patch)
tree9aec87bfb4dea2bb3e74ab08a8692838a79f9fa5 /Help/manual
parent8d3c919a3cbef7d92f24409fa7a5737e835957ee (diff)
parentc932f498426609beb14b9339c2a7dec3ea624998 (diff)
downloadCMake-fa00a3b29bdc962429af13c64f11b51fee8c58bb.zip
CMake-fa00a3b29bdc962429af13c64f11b51fee8c58bb.tar.gz
CMake-fa00a3b29bdc962429af13c64f11b51fee8c58bb.tar.bz2
Merge branch 'capabilities-fileapi' into release-3.15
Merge-request: !3433
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-file-api.7.rst2
-rw-r--r--Help/manual/cmake.1.rst16
2 files changed, 18 insertions, 0 deletions
diff --git a/Help/manual/cmake-file-api.7.rst b/Help/manual/cmake-file-api.7.rst
index f3e0208..04b6ed2 100644
--- a/Help/manual/cmake-file-api.7.rst
+++ b/Help/manual/cmake-file-api.7.rst
@@ -379,6 +379,8 @@ finds the file missing, that means a concurrent CMake has generated
a new reply. The client may simply start again by reading the new
reply index file.
+.. _`file-api object kinds`:
+
Object Kinds
============
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index f1d02eb..13cba71 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -423,6 +423,22 @@ Available commands are:
A list of strings with all the extra generators compatible with
the generator.
+ ``fileApi``
+ Optional member that is present when the :manual:`cmake-file-api(7)`
+ is available. The value is a JSON object with one member:
+
+ ``requests``
+ A JSON array containing zero or more supported file-api requests.
+ Each request is a JSON object with members:
+
+ ``kind``
+ Specifies one of the supported :ref:`file-api object kinds`.
+
+ ``version``
+ A JSON array whose elements are each a JSON object containing
+ ``major`` and ``minor`` members specifying non-negative integer
+ version components.
+
``serverMode``
``true`` if cmake supports server-mode and ``false`` otherwise.