Merge topic 'cmake-server-pad-arguments'

28e891f0 server-mode: Do not ignore the first cacheArgument on configure
This commit is contained in:
Brad King 2016-12-01 08:50:41 -05:00 committed by CMake Topic Stage
commit 23a63d2024

View File

@ -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()) {