[Cmake-commits] CMake branch, next, updated. v2.8.8-3029-g95509a3

[Peter Kuemmel]

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  95509a3a34593dca48ecc6b2cb5aa775480a116e (commit)
       via  128fe5d504196ab82dde5a7dfe0ffb031b03e590 (commit)
       via  0266c9bd1979b1136b33b4ca281eca00925e24cb (commit)
       via  5aab7f90f1fe96611eee6b0c9d12c6bb1030d23a (commit)
      from  91dd6340e95d69d0a8b543f2fec92d36cb2a4073 (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=95509a3a34593dca48ecc6b2cb5aa775480a116e
commit 95509a3a34593dca48ecc6b2cb5aa775480a116e
Merge: 91dd634 128fe5d
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jun 5 17:48:33 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 5 17:48:33 2012 -0400

    Merge topic 'ninja-rspfile' into next
    
    128fe5d Ninja: also create rspfile rules
    0266c9b Ninja: check for valid pointer
    5aab7f9 Ninja: 30000 is too long for windows cmd


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=128fe5d504196ab82dde5a7dfe0ffb031b03e590
commit 128fe5d504196ab82dde5a7dfe0ffb031b03e590
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jun 5 23:40:42 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Tue Jun 5 23:40:42 2012 +0200

    Ninja: also create rspfile rules

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 3e6ab76..ddf96eb 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -151,6 +151,8 @@ cmNinjaNormalTargetGenerator
 {
   cmTarget::TargetType targetType = this->GetTarget()->GetType();
   std::string ruleName = this->LanguageLinkerRule();
+  if (useResponseFile)
+    ruleName += "_RSPFILE";
 
   // Select whether to use a response file for objects.
   std::string rspfile;
@@ -174,7 +176,6 @@ cmNinjaNormalTargetGenerator
         } else {
           responseFlag = "@";
         }
-        ruleName += "_RSPFILE";
         rspfile = "$out.rsp";
         responseFlag += rspfile;
         vars.Objects = responseFlag.c_str();

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0266c9bd1979b1136b33b4ca281eca00925e24cb
commit 0266c9bd1979b1136b33b4ca281eca00925e24cb
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jun 5 23:29:29 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Tue Jun 5 23:29:29 2012 +0200

    Ninja: check for valid pointer

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 6717c3f..a91aa15 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -449,8 +449,8 @@ void cmGlobalNinjaGenerator
     }
 
   // check for mingw
-  std::string cc = mf->GetDefinition("CMAKE_C_COMPILER");
-  if(cc.find("gcc.exe") != std::string::npos)
+  const char* cc = mf->GetDefinition("CMAKE_C_COMPILER");
+  if(cc && std::string(cc).find("gcc.exe") != std::string::npos)
     {
     UsingMinGW = true;
     }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5aab7f90f1fe96611eee6b0c9d12c6bb1030d23a
commit 5aab7f90f1fe96611eee6b0c9d12c6bb1030d23a
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Jun 5 23:21:01 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Tue Jun 5 23:21:01 2012 +0200

    Ninja: 30000 is too long for windows cmd

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index a99167f..3e6ab76 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -484,7 +484,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   int cmdLineLimit = -1;
 #ifdef _WIN32
-  cmdLineLimit = 30000;
+  cmdLineLimit = 8100;
 #else
   // TODO
 #endif

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx       |    4 ++--
 Source/cmNinjaNormalTargetGenerator.cxx |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake