[Cmake-commits] CMake branch, next, updated. v2.8.8-3468-g9d6d4f7

[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  9d6d4f7b2a81147051424381591108e1d1d8951a (commit)
       via  46546809f5c7c5d0b96902f12f764eebf8cc1d48 (commit)
      from  e79ed5bd36dd9283db98ccab6b3e38a9fd2881ff (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=9d6d4f7b2a81147051424381591108e1d1d8951a
commit 9d6d4f7b2a81147051424381591108e1d1d8951a
Merge: e79ed5b 4654680
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Sun Jul 15 09:21:54 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 15 09:21:54 2012 -0400

    Merge topic 'ninja-mingw-windres' into next
    
    4654680 Ninja: windres is also used for cross-compiling


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46546809f5c7c5d0b96902f12f764eebf8cc1d48
commit 46546809f5c7c5d0b96902f12f764eebf8cc1d48
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Sun Jul 15 15:05:34 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Sun Jul 15 15:19:15 2012 +0200

    Ninja: windres is also used for cross-compiling
    
    It makes no sense to set windres.exe as default,
    especially when we are on Linux or Unix.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 07cc75f..78208e3 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -475,9 +475,8 @@ void cmGlobalNinjaGenerator
         {
         UsingMinGW = true;
         std::string rc = cmSystemTools::FindProgram("windres");
-        if(rc.empty())
-          rc = "windres.exe";;
-        mf->AddDefinition("CMAKE_RC_COMPILER", rc.c_str());
+        if(!rc.empty())
+          mf->AddDefinition("CMAKE_RC_COMPILER", rc.c_str());
         }
       }
     this->cmGlobalGenerator::EnableLanguage(language, mf, optional);

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

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


hooks/post-receive
-- 
CMake