diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-27 08:02:17 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-27 08:02:24 (GMT) |
| commit | e710d6953dae27f73452095df6d7b2d7ec698fd1 (patch) | |
| tree | 2f5b4c46d89fadcb3560436cf9aa743582d1f09c /Source/cmcmd.cxx | |
| parent | 19f2a706a3d0ca72f0c6151bbfcd3b944c14e72b (diff) | |
| parent | 27d87fbd04839e868ae7ef3c27ddfcb9379e80a0 (diff) | |
| download | CMake-e710d6953dae27f73452095df6d7b2d7ec698fd1.zip CMake-e710d6953dae27f73452095df6d7b2d7ec698fd1.tar.gz CMake-e710d6953dae27f73452095df6d7b2d7ec698fd1.tar.bz2 | |
Merge topic 'server-cxx11'
27d87fbd CTestCustom: Suppress exception loosening warning
7f29bbe6 server: always enable server
4614a3b2 server: backport to C++11
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1149
Diffstat (limited to 'Source/cmcmd.cxx')
| -rw-r--r-- | Source/cmcmd.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 7ec3e6d..bf5479c 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -15,13 +15,10 @@ #include "cm_auto_ptr.hxx" #include "cmake.h" -#if defined(HAVE_SERVER_MODE) && HAVE_SERVER_MODE -#include "cmServer.h" -#include "cmServerConnection.h" -#endif - #if defined(CMAKE_BUILD_WITH_CMAKE) #include "cmDependsFortran.h" // For -E cmake_copy_f90_mod callback. +#include "cmServer.h" +#include "cmServerConnection.h" #endif #if defined(CMAKE_BUILD_WITH_CMAKE) && defined(_WIN32) @@ -590,7 +587,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args) return 1; } cmake cm(cmake::RoleInternal); -#if defined(HAVE_SERVER_MODE) && HAVE_SERVER_MODE +#if defined(CMAKE_BUILD_WITH_CMAKE) std::cout << cm.ReportCapabilities(true); #else std::cout << cm.ReportCapabilities(false); @@ -1022,7 +1019,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args) return 1; } } -#if defined(HAVE_SERVER_MODE) && HAVE_SERVER_MODE +#if defined(CMAKE_BUILD_WITH_CMAKE) cmConnection* conn; if (isDebug) { conn = new cmServerStdIoConnection; |