diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-18 15:13:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-18 15:14:02 (GMT) |
| commit | fc4f3525133270ccc33ccda6acff6f85006ab457 (patch) | |
| tree | 31473b60683d51e6c0b747c502bc6f2098f66c56 /Source/cmcmd.cxx | |
| parent | 407c7415f41fc27578bb0ab2c831e767de575531 (diff) | |
| parent | cf0ae55dcb9224b92a95166f17452c56ba5b6213 (diff) | |
| download | CMake-fc4f3525133270ccc33ccda6acff6f85006ab457.zip CMake-fc4f3525133270ccc33ccda6acff6f85006ab457.tar.gz CMake-fc4f3525133270ccc33ccda6acff6f85006ab457.tar.bz2 | |
Merge topic 'server-refactor'
cf0ae55d server: Add support for connections that aren't event based
5ddfb6a4 server: Add connection as part of a request
d4f5d35c server: Refactor to make the event loop owned by server object
5acbf08b Tests: Teach Server test to forward exit code from server process
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !552
Diffstat (limited to 'Source/cmcmd.cxx')
| -rw-r--r-- | Source/cmcmd.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 10889eb..c546c7e 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -44,6 +44,8 @@ #include <stdlib.h> #include <time.h> +class cmConnection; + int cmcmd_cmake_ninja_depends(std::vector<std::string>::const_iterator argBeg, std::vector<std::string>::const_iterator argEnd); int cmcmd_cmake_ninja_dyndep(std::vector<std::string>::const_iterator argBeg, @@ -1022,7 +1024,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args) } } #if defined(HAVE_SERVER_MODE) && HAVE_SERVER_MODE - cmServerConnection* conn; + cmConnection* conn; if (isDebug) { conn = new cmServerStdIoConnection; } else { |