diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-01 13:50:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-12-01 13:50:41 (GMT) |
| commit | 23a63d202417f3d31273041a04b16af2ff361e54 (patch) | |
| tree | 40f3ac60fca3aa63945eba0ec8a2a6081186d2e2 /Source/cmServerProtocol.cxx | |
| parent | 75f2a1e4598c0ecb16537e1b1344b63d69c6b0f6 (diff) | |
| parent | 28e891f0c7edff8dacecd7526c42e8e23e90271a (diff) | |
| download | CMake-23a63d202417f3d31273041a04b16af2ff361e54.zip CMake-23a63d202417f3d31273041a04b16af2ff361e54.tar.gz CMake-23a63d202417f3d31273041a04b16af2ff361e54.tar.bz2 | |
Merge topic 'cmake-server-pad-arguments'
28e891f0 server-mode: Do not ignore the first cacheArgument on configure
Diffstat (limited to 'Source/cmServerProtocol.cxx')
| -rw-r--r-- | Source/cmServerProtocol.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index 9a06f05..3776538 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -936,7 +936,7 @@ cmServerResponse cmServerProtocol1_0::ProcessConfigure( } // Make sure the types of cacheArguments matches (if given): - std::vector<std::string> cacheArgs; + std::vector<std::string> cacheArgs = { "unused" }; bool cacheArgumentsError = false; const Json::Value passedArgs = request.Data[kCACHE_ARGUMENTS_KEY]; if (!passedArgs.isNull()) { |