[Cmake-commits] CMake branch, next, updated. v2.8.8-3470-geab2fb5

[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  eab2fb5a665bbbff69d21ffc7c5184959beebacf (commit)
       via  0c89c10cfcd9bdd11531e3680216235f5b34ac8e (commit)
      from  9d6d4f7b2a81147051424381591108e1d1d8951a (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=eab2fb5a665bbbff69d21ffc7c5184959beebacf
commit eab2fb5a665bbbff69d21ffc7c5184959beebacf
Merge: 9d6d4f7 0c89c10
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Jul 15 10:05:21 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 15 10:05:21 2012 -0400

    Merge topic 'ninja-mingw-windres' into next
    
    0c89c10 Ninja: search for windres with prefix


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c89c10cfcd9bdd11531e3680216235f5b34ac8e
commit 0c89c10cfcd9bdd11531e3680216235f5b34ac8e
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Sun Jul 15 16:03:22 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Sun Jul 15 16:04:26 2012 +0200

    Ninja: search for windres with prefix

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 78208e3..3c97afc 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -474,9 +474,17 @@ void cmGlobalNinjaGenerator
       if(mf->IsOn("CMAKE_COMPILER_IS_MINGW"))
         {
         UsingMinGW = true;
-        std::string rc = cmSystemTools::FindProgram("windres");
-        if(!rc.empty())
-          mf->AddDefinition("CMAKE_RC_COMPILER", rc.c_str());
+        if(!mf->GetDefinition("CMAKE_RC_COMPILER"))
+          {
+          std::string windres = "windres";
+          std::string gcc = mf->GetRequiredDefinition("CMAKE_C_COMPILER");
+          std::string::size_type prefix = gcc.rfind("gcc");
+          if (prefix != std::string::npos)
+            windres.insert(0, gcc.substr(0, prefix));
+          windres = cmSystemTools::FindProgram(windres.c_str());
+          if(!windres.empty())
+            mf->AddDefinition("CMAKE_RC_COMPILER", windres.c_str());
+          }
         }
       }
     this->cmGlobalGenerator::EnableLanguage(language, mf, optional);

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

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


hooks/post-receive
-- 
CMake