[Cmake-commits] CMake branch, next, updated. v3.7.0-1453-g093053c

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  093053c0972b492b2ac3dd78b4a86047ac54a2b5 (commit)
       via  28e891f0c7edff8dacecd7526c42e8e23e90271a (commit)
      from  e2bc5a3721de77f33e767b6b93ce5374b54b3f83 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=093053c0972b492b2ac3dd78b4a86047ac54a2b5
commit 093053c0972b492b2ac3dd78b4a86047ac54a2b5
Merge: e2bc5a3 28e891f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 30 13:14:49 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 30 13:14:49 2016 -0500

    Merge topic 'cmake-server-pad-arguments' into next
    
    28e891f0 server-mode: Do not ignore the first cacheArgument on configure


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28e891f0c7edff8dacecd7526c42e8e23e90271a
commit 28e891f0c7edff8dacecd7526c42e8e23e90271a
Author:     Tobias Hunger <tobias.hunger at qt.io>
AuthorDate: Wed Nov 30 17:20:34 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 30 13:14:15 2016 -0500

    server-mode: Do not ignore the first cacheArgument on configure
    
    SetCacheArgs skips the first argument it gets, so add some padding before
    calling it.

diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index d35efe0..e159c8f 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -923,7 +923,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()) {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmServerProtocol.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake