diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-28 12:26:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-28 12:26:49 (GMT) |
| commit | 18a966c80feb7459aadbda1e34f2c0a63beb7044 (patch) | |
| tree | aa63448cea7d937e99bc795a4efd4676263136ef /Help | |
| parent | 891711aaffb150456d83f0698d401f61463d5ced (diff) | |
| parent | 42ccbee11c1b3be12c5ebb9f69cb769d79d491ad (diff) | |
| download | CMake-18a966c80feb7459aadbda1e34f2c0a63beb7044.zip CMake-18a966c80feb7459aadbda1e34f2c0a63beb7044.tar.gz CMake-18a966c80feb7459aadbda1e34f2c0a63beb7044.tar.bz2 | |
Merge topic 'cmake-server-handshake-improvements'
42ccbee1 server-mode: Handle generator toolset and platform in handshake
d792491c cmake-server: Better error reporting during handshake
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/cmake-server.7.rst | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst index a72af14..9520cc1 100644 --- a/Help/manual/cmake-server.7.rst +++ b/Help/manual/cmake-server.7.rst @@ -276,7 +276,9 @@ Protocol version 1.0 requires the following attributes to be set: * "sourceDirectory" with a path to the sources * "buildDirectory" with a path to the build directory * "generator" with the generator name - * "extraGenerator" (optional!) with the extra generator to be used. + * "extraGenerator" (optional!) with the extra generator to be used + * "platform" with the generator platform (if supported by the generator) + * "toolset" with the generator toolset (if supported by the generator) Example:: |