[Cmake-commits] CMake branch, next, updated. v2.8.9-290-g19fa7dc

[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  19fa7dcb0a78cbab0f5aebb1b38883b3c24b4c2f (commit)
       via  be9afbf4535f5dc3650ea41480b2c9a58d4f94c0 (commit)
      from  691b9e5c6e27596f0367af46b56d957e38a1e45f (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=19fa7dcb0a78cbab0f5aebb1b38883b3c24b4c2f
commit 19fa7dcb0a78cbab0f5aebb1b38883b3c24b4c2f
Merge: 691b9e5 be9afbf
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Aug 27 11:00:23 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 27 11:00:23 2012 -0400

    Merge topic 'mingw-unix-generator' into next
    
    be9afbf Find mingw's windres also when Unix Makefiles are used


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be9afbf4535f5dc3650ea41480b2c9a58d4f94c0
commit be9afbf4535f5dc3650ea41480b2c9a58d4f94c0
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Mon Aug 27 16:54:21 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Mon Aug 27 16:54:21 2012 +0200

    Find mingw's windres also when Unix Makefiles are used

diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index 50ba80b..2bb7a20 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -57,6 +57,10 @@ if("${_help}" MATCHES "GNU ld .* 2\\.1[1-6]")
   set(__WINDOWS_GNU_LD_RESPONSE 0)
 endif()
 
+if(NOT CMAKE_GENERATOR_RC AND CMAKE_GENERATOR MATCHES "Unix Makefiles")
+  set(CMAKE_GENERATOR_RC windres)
+endif()
+
 enable_language(RC)
 
 macro(__windows_compiler_gnu lang)

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

Summary of changes:
 Modules/Platform/Windows-GNU.cmake |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake