[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2222-ge8c76d1

[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  e8c76d18bc0e6f834dfbbc278ceb2432d871f631 (commit)
       via  7147ed5ce45ac6ae9d5f4e6e45bce2c66be39be3 (commit)
       via  db924e00b4ddb7c068103e43f314042b154f38ac (commit)
      from  35435b77a28c83fd7fde8fdbebf7f96279e7d7ee (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=e8c76d18bc0e6f834dfbbc278ceb2432d871f631
commit e8c76d18bc0e6f834dfbbc278ceb2432d871f631
Merge: 35435b7 7147ed5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 11 09:10:59 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 11 09:10:59 2014 -0400

    Merge topic 'rc-windres-with-dot' into next
    
    7147ed5c CMakeRCInformation: Recognize 'windres' tools with '.' in name (#14865)
    db924e00 CMakeRCInformation: Do not mention 'Fortran' in documentation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7147ed5ce45ac6ae9d5f4e6e45bce2c66be39be3
commit 7147ed5ce45ac6ae9d5f4e6e45bce2c66be39be3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 10 10:10:39 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 11 09:10:56 2014 -0400

    CMakeRCInformation: Recognize 'windres' tools with '.' in name (#14865)
    
    A 64-bit MinGW windres is named "i686-w64-mingw32.shared-windres".  The
    get_filename_component NAME_WE mode may strip the ".shared-windres" part
    and cause the result to no longer contain "windres".  Instead, match the
    "windres" name in the full CMAKE_RC_COMPILER value first, and use the
    get_filename_component code path only for other resource compilers.

diff --git a/Modules/CMakeRCInformation.cmake b/Modules/CMakeRCInformation.cmake
index 6899457..6bb2636 100644
--- a/Modules/CMakeRCInformation.cmake
+++ b/Modules/CMakeRCInformation.cmake
@@ -19,9 +19,10 @@
 
 # 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")
+if(CMAKE_RC_COMPILER MATCHES "windres[^/]*$")
+ set(CMAKE_BASE_NAME "windres")
+else()
+ get_filename_component(CMAKE_BASE_NAME ${CMAKE_RC_COMPILER} NAME_WE)
 endif()
 set(CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE
   ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db924e00b4ddb7c068103e43f314042b154f38ac
commit db924e00b4ddb7c068103e43f314042b154f38ac
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 10 10:08:17 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 11 09:10:56 2014 -0400

    CMakeRCInformation: Do not mention 'Fortran' in documentation
    
    This module is for the Windows Resource Compiler, not Fortran.

diff --git a/Modules/CMakeRCInformation.cmake b/Modules/CMakeRCInformation.cmake
index 8ffe50a..6899457 100644
--- a/Modules/CMakeRCInformation.cmake
+++ b/Modules/CMakeRCInformation.cmake
@@ -13,7 +13,7 @@
 #  License text for the above reference.)
 
 
-# This file sets the basic flags for the Fortran language in CMake.
+# This file sets the basic flags for the Windows Resource Compiler.
 # It also loads the available platform file for the system-compiler
 # if it exists.
 
@@ -30,7 +30,7 @@ include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
 
 
 set (CMAKE_RC_FLAGS "$ENV{RCFLAGS} ${CMAKE_RC_FLAGS_INIT}" CACHE STRING
-     "Flags for Fortran compiler.")
+     "Flags for Windows Resource Compiler.")
 
 # These are the only types of flags that should be passed to the rc
 # command, if COMPILE_FLAGS is used on a target this will be used

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

Summary of changes:


hooks/post-receive
-- 
CMake