[Cmake-commits] CMake branch, next, updated. v2.8.8-3474-g88dc1b1

[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  88dc1b1a096dee2fb417e034de550e89dd59e51c (commit)
       via  78588e03435103fca17372278cbecf29c867eec1 (commit)
      from  e95797bd7782078e3b046f39021b2e98550ed8bc (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=88dc1b1a096dee2fb417e034de550e89dd59e51c
commit 88dc1b1a096dee2fb417e034de550e89dd59e51c
Merge: e95797b 78588e0
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Jul 15 12:50:06 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 15 12:50:06 2012 -0400

    Merge topic 'ninja-mingw-windres' into next
    
    78588e0 Ninja: there could be null pointers


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78588e03435103fca17372278cbecf29c867eec1
commit 78588e03435103fca17372278cbecf29c867eec1
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Sun Jul 15 18:48:31 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Sun Jul 15 18:48:31 2012 +0200

    Ninja: there could be null pointers

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 3c97afc..ca3a270 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -474,10 +474,11 @@ void cmGlobalNinjaGenerator
       if(mf->IsOn("CMAKE_COMPILER_IS_MINGW"))
         {
         UsingMinGW = true;
-        if(!mf->GetDefinition("CMAKE_RC_COMPILER"))
+        if(!mf->GetDefinition("CMAKE_RC_COMPILER")
+           && mf->GetDefinition("CMAKE_C_COMPILER"))
           {
           std::string windres = "windres";
-          std::string gcc = mf->GetRequiredDefinition("CMAKE_C_COMPILER");
+          std::string gcc = mf->GetDefinition("CMAKE_C_COMPILER");
           std::string::size_type prefix = gcc.rfind("gcc");
           if (prefix != std::string::npos)
             windres.insert(0, gcc.substr(0, prefix));

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

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


hooks/post-receive
-- 
CMake