summaryrefslogtreecommitdiffstats
path: root/Source/cmServerProtocol.cxx
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2016-09-09 10:50:23 (GMT)
committerTobias Hunger <tobias.hunger@qt.io>2016-09-22 14:30:02 (GMT)
commitcc576c2c7f3272ec5370dc3cb45838c20d1837f9 (patch)
tree602548f309c03bb384d81d254271fd6a01b15516 /Source/cmServerProtocol.cxx
parent277ffa2881d4073a660490f959cb58ad0dcb3f82 (diff)
downloadCMake-cc576c2c7f3272ec5370dc3cb45838c20d1837f9.zip
CMake-cc576c2c7f3272ec5370dc3cb45838c20d1837f9.tar.gz
CMake-cc576c2c7f3272ec5370dc3cb45838c20d1837f9.tar.bz2
server-mode: Pass server into cmServerProtocol
The information will be needed to send signals.
Diffstat (limited to 'Source/cmServerProtocol.cxx')
-rw-r--r--Source/cmServerProtocol.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index 030b0fd..16a6374 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -109,9 +109,12 @@ Json::Value cmServerResponse::Data() const
return this->m_Data;
}
-bool cmServerProtocol::Activate(const cmServerRequest& request,
+bool cmServerProtocol::Activate(cmServer* server,
+ const cmServerRequest& request,
std::string* errorMessage)
{
+ assert(server);
+ this->m_Server = server;
this->m_CMakeInstance = std::make_unique<cmake>();
const bool result = this->DoActivate(request, errorMessage);
if (!result)