summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-08-15 17:17:40 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-08-15 17:17:49 (GMT)
commitf2cab9855bf5a041379e3a5bbdd26ca3ddeab87a (patch)
tree118a75ed68bd3b4fc852050e22752cad5126059d /Help
parent8cfd52981d70bb0219fb23118b35a50faf320022 (diff)
parent9b3c5ccf1200e237c0bad3336235b9dde289f016 (diff)
downloadCMake-f2cab9855bf5a041379e3a5bbdd26ca3ddeab87a.zip
CMake-f2cab9855bf5a041379e3a5bbdd26ca3ddeab87a.tar.gz
CMake-f2cab9855bf5a041379e3a5bbdd26ca3ddeab87a.tar.bz2
Merge topic 'server-allow-cache'
9b3c5ccf Server: test cache after reconnect 1df38758 cmServerProtocol: allow 'cache' request before 'configure' 187332b2 cmServerProtocol: fix test of empty values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !977
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-server.7.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst
index f6d3032..c56e5a7 100644
--- a/Help/manual/cmake-server.7.rst
+++ b/Help/manual/cmake-server.7.rst
@@ -277,7 +277,9 @@ 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.
-Each protocol version may request additional attributes to be present.
+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:
@@ -664,8 +666,7 @@ and will not survive the build directory getting cleaned out.
Type "cache"
^^^^^^^^^^^^
-The "cache" request can be used once a project is configured and will
-list the cached configuration values.
+The "cache" request will list the cached configuration values.
Example::