diff options
| author | Brad King <brad.king@kitware.com> | 2018-09-21 15:11:36 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-09-21 15:39:59 (GMT) |
| commit | 72b4c2c48ae7dfd8c2813018c72ed0d2e6bb907a (patch) | |
| tree | 11976bcd9d3e5da19fa1151eeb05389f7796e846 /Source/cmServerProtocol.cxx | |
| parent | b48165346f7dfcd025beca743abf2eaf849bf17d (diff) | |
| download | CMake-72b4c2c48ae7dfd8c2813018c72ed0d2e6bb907a.zip CMake-72b4c2c48ae7dfd8c2813018c72ed0d2e6bb907a.tar.gz CMake-72b4c2c48ae7dfd8c2813018c72ed0d2e6bb907a.tar.bz2 | |
server: Compile json object generation source separately
Declare entry points in a dedicated header and compile the source
separately instead of including it in the server implementation.
Diffstat (limited to 'Source/cmServerProtocol.cxx')
| -rw-r--r-- | Source/cmServerProtocol.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index 6a09776..f75a5ce 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -7,6 +7,7 @@ #include "cmFileMonitor.h" #include "cmGlobalGenerator.h" #include "cmJsonObjectDictionary.h" +#include "cmJsonObjects.h" #include "cmServer.h" #include "cmServerDictionary.h" #include "cmState.h" @@ -37,8 +38,6 @@ std::vector<std::string> toStringList(const Json::Value& in) } // namespace -#include "cmJsonObjects.cxx" - cmServerRequest::cmServerRequest(cmServer* server, cmConnection* connection, const std::string& t, const std::string& c, const Json::Value& d) @@ -473,7 +472,7 @@ cmServerResponse cmServerProtocol1::ProcessCMakeInputs( Json::Value result = Json::objectValue; result[kSOURCE_DIRECTORY_KEY] = sourceDir; result[kCMAKE_ROOT_DIRECTORY_KEY] = cmakeRootDir; - result[kBUILD_FILES_KEY] = DumpCMakeInputs(cm); + result[kBUILD_FILES_KEY] = cmDumpCMakeInputs(cm); return request.Reply(result); } @@ -484,7 +483,7 @@ cmServerResponse cmServerProtocol1::ProcessCodeModel( return request.ReportError("No build system was generated yet."); } - return request.Reply(DumpCodeModel(this->CMakeInstance())); + return request.Reply(cmDumpCodeModel(this->CMakeInstance())); } cmServerResponse cmServerProtocol1::ProcessCompute( @@ -601,7 +600,8 @@ cmServerResponse cmServerProtocol1::ProcessConfigure( } std::vector<std::string> toWatchList; - getCMakeInputs(gg, std::string(), buildDir, nullptr, &toWatchList, nullptr); + cmGetCMakeInputs(gg, std::string(), buildDir, nullptr, &toWatchList, + nullptr); FileMonitor()->MonitorPaths(toWatchList, [this](const std::string& p, int e, int s) { @@ -707,7 +707,7 @@ cmServerResponse cmServerProtocol1::ProcessCTests( return request.ReportError("This instance was not yet computed."); } - return request.Reply(DumpCTestInfo(this->CMakeInstance())); + return request.Reply(cmDumpCTestInfo(this->CMakeInstance())); } cmServerProtocol1::GeneratorInformation::GeneratorInformation( |