[Cmake-commits] CMake branch, next, updated. v2.8.8-3037-ge16fedc

[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  e16fedc1d2a8bd147050a4a5c10b98149ef113af (commit)
       via  e3a1f727f75e6077e7724719c606d833e8bbd9b0 (commit)
      from  b711fb6b0476f8957767822c1f232c823f4a6c77 (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=e16fedc1d2a8bd147050a4a5c10b98149ef113af
commit e16fedc1d2a8bd147050a4a5c10b98149ef113af
Merge: b711fb6 e3a1f72
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Wed Jun 6 07:14:10 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 6 07:14:10 2012 -0400

    Merge topic 'ninja-rspfile' into next
    
    e3a1f72 Ninja: find mingw's resource compiler


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3a1f727f75e6077e7724719c606d833e8bbd9b0
commit e3a1f727f75e6077e7724719c606d833e8bbd9b0
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Wed Jun 6 13:02:30 2012 +0200
Commit:     Peter Kuemmel <syntheticpp at gmx.net>
CommitDate: Wed Jun 6 13:02:30 2012 +0200

    Ninja: find mingw's resource compiler

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 5477adf..c4b1cc9 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -434,16 +434,19 @@ void cmGlobalNinjaGenerator
                  cmMakefile *mf,
                  bool optional)
 {
-  this->cmGlobalGenerator::EnableLanguage(languages, mf, optional);
   std::string path;
   for(std::vector<std::string>::const_iterator l = languages.begin();
       l != languages.end(); ++l)
     {
+    std::vector<std::string> language;
+    language.push_back(*l);
+
     if(*l == "NONE")
       {
+      this->cmGlobalGenerator::EnableLanguage(language, mf, optional);
       continue;
       }
-    if(*l == "Fortran")
+    else if(*l == "Fortran")
       {
       std::string message = "The \"";
       message += this->GetName();
@@ -452,15 +455,22 @@ void cmGlobalNinjaGenerator
       message += "\" yet.";
       cmSystemTools::Error(message.c_str());
       }
+    else if(*l == "RC")
+      {
+      // check if mingw is used
+      const char* cc = mf->GetDefinition("CMAKE_C_COMPILER");
+      if(cc && std::string(cc).find("gcc.exe") != std::string::npos)
+      {
+        UsingMinGW = true;
+        std::string rc = cmSystemTools::FindProgram("windres");
+        if(rc.empty())
+          rc = "windres.exe";;
+        mf->AddDefinition("CMAKE_RC_COMPILER", rc.c_str());
+        }
+      }
+    this->cmGlobalGenerator::EnableLanguage(language, mf, optional);
     this->ResolveLanguageCompiler(*l, mf, optional);
-    }
-
-  // check for mingw
-  const char* cc = mf->GetDefinition("CMAKE_C_COMPILER");
-  if(cc && std::string(cc).find("gcc.exe") != std::string::npos)
-    {
-    UsingMinGW = true;
-    }
+  }
 }
 
 bool cmGlobalNinjaGenerator::UsingMinGW = false;

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake