[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3605-g8f277d5

[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  8f277d560dacfc83f2bea3de9a7a8c839a21511b (commit)
       via  514c2e3d9e3956b198dabc04cd4e0916750c5703 (commit)
      from  c04390e2cb68634999cb3af24f39775b8b87774e (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=8f277d560dacfc83f2bea3de9a7a8c839a21511b
commit 8f277d560dacfc83f2bea3de9a7a8c839a21511b
Merge: c04390e 514c2e3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 6 10:11:57 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 6 10:11:57 2014 -0400

    Merge topic 'windows-RC-extension' into next
    
    514c2e3d CMakeRCCompiler: Handle uppercase 'RC' as resource file format extension


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=514c2e3d9e3956b198dabc04cd4e0916750c5703
commit 514c2e3d9e3956b198dabc04cd4e0916750c5703
Author:     Tim Blechmann <tim at klingt.org>
AuthorDate: Fri Jun 6 15:47:29 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 6 10:11:15 2014 -0400

    CMakeRCCompiler: Handle uppercase 'RC' as resource file format extension
    
    We already match lowercase 'rc'.  Add 'RC' too.  The latter is listed in
    other CMake<LANG>Compiler modules as ignored for their languages already.
    
    Signed-off-by: Tim Blechmann <tim at klingt.org>

diff --git a/Modules/CMakeRCCompiler.cmake.in b/Modules/CMakeRCCompiler.cmake.in
index 0fc3142..8257cd6 100644
--- a/Modules/CMakeRCCompiler.cmake.in
+++ b/Modules/CMakeRCCompiler.cmake.in
@@ -1,6 +1,6 @@
 set(CMAKE_RC_COMPILER "@CMAKE_RC_COMPILER@")
 set(CMAKE_RC_COMPILER_ARG1 "@CMAKE_RC_COMPILER_ARG1@")
 set(CMAKE_RC_COMPILER_LOADED 1)
-set(CMAKE_RC_SOURCE_FILE_EXTENSIONS rc)
+set(CMAKE_RC_SOURCE_FILE_EXTENSIONS rc;RC)
 set(CMAKE_RC_OUTPUT_EXTENSION @CMAKE_RC_OUTPUT_EXTENSION@)
 set(CMAKE_RC_COMPILER_ENV_VAR "RC")

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

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


hooks/post-receive
-- 
CMake