diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-12 15:40:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-06-12 15:40:47 (GMT) |
| commit | 1492dc8301ba5844b830316bcc2677aa1bdae897 (patch) | |
| tree | 56f1af1d78a045b3d196d2dbdc6aebbb9ae1096a /Help | |
| parent | b7d72db89de6a9ddc8c8740a6e8b8980d108b900 (diff) | |
| parent | c932f498426609beb14b9339c2a7dec3ea624998 (diff) | |
| download | CMake-1492dc8301ba5844b830316bcc2677aa1bdae897.zip CMake-1492dc8301ba5844b830316bcc2677aa1bdae897.tar.gz CMake-1492dc8301ba5844b830316bcc2677aa1bdae897.tar.bz2 | |
Merge topic 'capabilities-fileapi'
c932f49842 cmake: Teach -E capabilities to report supported fileapi requests
6696855f72 cmake: Simplify implementation of -E capabilities
6b815e58ba fileapi: Factor out helper to construct a version object
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3433
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-file-api.7.rst | 2 | ||||
| -rw-r--r-- | Help/manual/cmake.1.rst | 16 |
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. |