[Cmake-commits] CMake branch, next, updated. v2.8.6-2200-g4d9a5b6

[David Cole]

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  4d9a5b6c65247f948167ef7a22bf133ea7ff0f37 (commit)
       via  6ddb1e5b9a3eff941ad12d29609839871fe518ed (commit)
      from  978acdb83c6f78ba35aca2c6690b123f67d90764 (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=4d9a5b6c65247f948167ef7a22bf133ea7ff0f37
commit 4d9a5b6c65247f948167ef7a22bf133ea7ff0f37
Merge: 978acdb 6ddb1e5
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Dec 13 20:03:59 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 13 20:03:59 2011 -0500

    Merge topic 'fix-12480-correct-windres-compiler-when-cross-compiling' into next
    
    6ddb1e5 Modules: Use "windres" as rc compiler base name for cross-compiles (#12480)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ddb1e5b9a3eff941ad12d29609839871fe518ed
commit 6ddb1e5b9a3eff941ad12d29609839871fe518ed
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Dec 13 19:57:00 2011 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Dec 13 19:57:00 2011 -0500

    Modules: Use "windres" as rc compiler base name for cross-compiles (#12480)
    
    ...if it matches "windres", as opposed to being exactly equal to "windres"
    
    Cross-compiling windres compilers are named something like
    "i686-w64-mingw32-windres" (for example)

diff --git a/Modules/CMakeRCInformation.cmake b/Modules/CMakeRCInformation.cmake
index fcd0099..859fe11 100644
--- a/Modules/CMakeRCInformation.cmake
+++ b/Modules/CMakeRCInformation.cmake
@@ -20,6 +20,9 @@
 # make sure we don't use CMAKE_BASE_NAME from somewhere else
 SET(CMAKE_BASE_NAME)
 GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE)
+IF("${CMAKE_BASE_NAME}" MATCHES "windres")
+  SET(CMAKE_BASE_NAME "windres")
+ENDIF()
 SET(CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE
   ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
 INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)

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

Summary of changes:
 Modules/CMakeRCInformation.cmake |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake