[Cmake-commits] CMake branch, next, updated. v3.2.2-2665-g27d3244

[Brad King]

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  27d3244480a208f7939a0d88e746cafe76397d58 (commit)
       via  cf8ce7a39e425aa5ea6a4847f512b8e8628af61a (commit)
      from  93aad74a0ef9c9ae887b51891c3a9cf247bfc1ea (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=27d3244480a208f7939a0d88e746cafe76397d58
commit 27d3244480a208f7939a0d88e746cafe76397d58
Merge: 93aad74 cf8ce7a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 11 09:04:11 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 11 09:04:11 2015 -0400

    Merge topic 'ninja-gcc-windows' into next
    
    cf8ce7a3 RC: Do not override MinGW Makefiles generator preference


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf8ce7a39e425aa5ea6a4847f512b8e8628af61a
commit cf8ce7a39e425aa5ea6a4847f512b8e8628af61a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 11 09:00:25 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 11 09:00:25 2015 -0400

    RC: Do not override MinGW Makefiles generator preference
    
    Update logic added in commit 957c2aac (RC: Simplify selection of
    resource compiler based on C/C++ toolchain, 2015-05-07) to avoid
    overriding CMAKE_GENERATOR_RC.  The MinGW and MSYS Makefiles
    generators use it to select a windres next to the compiler even
    if it is not in the PATH.

diff --git a/Modules/Platform/Windows-GNU.cmake b/Modules/Platform/Windows-GNU.cmake
index c0d7d8c..b571b16 100644
--- a/Modules/Platform/Windows-GNU.cmake
+++ b/Modules/Platform/Windows-GNU.cmake
@@ -138,7 +138,7 @@ macro(__windows_compiler_gnu lang)
     endforeach()
   endif()
 
-  if(NOT CMAKE_RC_COMPILER_INIT)
+  if(NOT CMAKE_RC_COMPILER_INIT AND NOT CMAKE_GENERATOR_RC)
     set(CMAKE_RC_COMPILER_INIT windres)
   endif()
 

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

Summary of changes:
 Modules/Platform/Windows-GNU.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake