mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 21:00:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

server-mode: Automate progress reporting

Browse Source 
Wire up cmake::SetProgressUpdate to do progress reporting via the
cmake server.
This commit is contained in:
Tobias Hunger
2016-09-09 10:01:44 +02:00
parent 70b8ba9a0f
commit ca7799482c
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmServer.cxx
+18 -2
View File
@@ -134,8 +134,13 @@ void cmServer::PopOne()
return;
}
this->WriteResponse(this->Protocol ? this->Protocol->Process(request)
: this->SetProtocolVersion(request));
if (this->Protocol) {
this->Protocol->CMakeInstance()->SetProgressCallback(
reportProgress, const_cast<cmServerRequest*>(&request));
this->WriteResponse(this->Protocol->Process(request));
} else {
this->WriteResponse(this->SetProtocolVersion(request));
}
}
void cmServer::handleData(const std::string& data)
@@ -210,6 +215,17 @@ void cmServer::PrintHello() const
this->WriteJsonObject(hello);
}
void cmServer::reportProgress(const char* msg, float progress, void* data)
{
const cmServerRequest* request = static_cast<const cmServerRequest*>(data);
assert(request);
if (progress < 0.0 || progress > 1.0) {
request->ReportProgress(0, 0, 0, msg);
} else {
request->ReportProgress(0, static_cast<int>(progress * 1000), 1000, msg);
}
}
cmServerResponse cmServer::SetProtocolVersion(const cmServerRequest& request)
{
if (request.Type != "handshake")