summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-01-25 13:35:23 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-01-25 13:35:28 (GMT)
commit5c724c4ca83059b13e6fd64dad9ee88f59162166 (patch)
tree09a42c3d5fe1c127386160a830fa693e39de6a86 /Help
parentaaf3c5b32c9e75fb738fcc00228551f678db26d5 (diff)
parent239a3ef8215416d3fa7d7c1b0bf812b17b3437df (diff)
downloadCMake-5c724c4ca83059b13e6fd64dad9ee88f59162166.zip
CMake-5c724c4ca83059b13e6fd64dad9ee88f59162166.tar.gz
CMake-5c724c4ca83059b13e6fd64dad9ee88f59162166.tar.bz2
Merge topic 'server-polish-opt-handshake'
239a3ef8 Server-mode: Document protocol version for optional handshake arguments 9b1a3d24 Server-mode: Rename functions to reflect what they do Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1693
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-server.7.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst
index 1ddcb1b..0fed0b1 100644
--- a/Help/manual/cmake-server.7.rst
+++ b/Help/manual/cmake-server.7.rst
@@ -277,10 +277,6 @@ Giving the "major" version of the requested protocol version will make the serve
use the latest minor version of that protocol. Use this if you do not explicitly
need to depend on a specific minor version.
-If the build directory already contains a CMake cache, it is sufficient to set
-the "buildDirectory" attribute. To create a fresh build directory, additional
-attributes are required depending on the protocol version.
-
Protocol version 1.0 requires the following attributes to be set:
* "sourceDirectory" with a path to the sources
@@ -290,6 +286,10 @@ Protocol version 1.0 requires the following attributes to be set:
* "platform" with the generator platform (if supported by the generator)
* "toolset" with the generator toolset (if supported by the generator)
+Protocol version 1.2 makes all but the build directory optional, provided
+there is a valid cache in the build directory that contains all the other
+information already.
+
Example::
[== "CMake Server" ==[