[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-474-gac54d6f

[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  ac54d6f799a517974064f6bde7c07dbb82578dc9 (commit)
       via  3504f9b9ff8d76739f39af2bd2de8b6068431c2e (commit)
      from  ab11eb2aa6f48e0025215601756aca8034132db9 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac54d6f799a517974064f6bde7c07dbb82578dc9
commit ac54d6f799a517974064f6bde7c07dbb82578dc9
Merge: ab11eb2 3504f9b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 4 10:15:10 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 4 10:15:10 2014 -0500

    Merge topic 'fix-check-build-system-crash' into next
    
    3504f9b9 cmake: Fix --check-build-system argument count check (#14784)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3504f9b9ff8d76739f39af2bd2de8b6068431c2e
commit 3504f9b9ff8d76739f39af2bd2de8b6068431c2e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 4 10:11:32 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 4 10:12:08 2014 -0500

    cmake: Fix --check-build-system argument count check (#14784)
    
    This internal option requires two arguments, not just one.  Fix the
    argument count required to recognize the option.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 33fb0fc..abbabe7 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -653,7 +653,7 @@ void cmake::SetArgs(const std::vector<std::string>& args,
       cmSystemTools::ConvertToUnixSlashes(path);
       this->SetHomeOutputDirectory(path.c_str());
       }
-    else if((i < args.size()-1) && (arg.find("--check-build-system",0) == 0))
+    else if((i < args.size()-2) && (arg.find("--check-build-system",0) == 0))
       {
       this->CheckBuildSystemArgument = args[++i];
       this->ClearBuildSystem = (atoi(args[++i].c_str()) > 0);

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

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


hooks/post-receive
-- 
CMake