[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1302-gc97c540

[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  c97c540090e8b93a9fe4f39dd3826b62f4d8a34f (commit)
       via  95cdf132489c79e88a10fdf7a7566fa002c7680b (commit)
      from  ec566495e51ad8479afd9f8a6f0ae808dd5b6a9b (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=c97c540090e8b93a9fe4f39dd3826b62f4d8a34f
commit c97c540090e8b93a9fe4f39dd3826b62f4d8a34f
Merge: ec56649 95cdf13
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 20 10:10:17 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 20 10:10:17 2014 -0400

    Merge topic 'compile-m-as-c' into next
    
    95cdf132 Treat .m files consistently as C across all generators


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95cdf132489c79e88a10fdf7a7566fa002c7680b
commit 95cdf132489c79e88a10fdf7a7566fa002c7680b
Author:     Tim Blechmann <tim at klingt.org>
AuthorDate: Wed Mar 19 17:31:01 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 20 09:40:41 2014 -0400

    Treat .m files consistently as C across all generators
    
    Objective C sources should be compiled with the C compiler, not C++.
    
    The Xcode generator correctly classifies ".m" sources already.  The
    cmSystemTools::GetFileFormat method was fixed by commit v2.8.0~1782 (fix
    for 7045, use gcc for .m, 2008-08-19) but it is not used by any of the
    generator since commit v2.4.0~2819 (major changes to support addition of
    languages, 2004-09-22).
    
    Fix the CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS table entries so that
    cmGlobalGenerator::GetLanguageFromExtension tells the Makefile, Ninja,
    and VS IDE generators to compile ".m" sources as C.  This makes behavior
    consistent on all generators.
    
    Signed-off-by: Tim Blechmann <tim at klingt.org>

diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in
index 804cce2..694f8b8 100644
--- a/Modules/CMakeCCompiler.cmake.in
+++ b/Modules/CMakeCCompiler.cmake.in
@@ -26,7 +26,7 @@ if(CMAKE_COMPILER_IS_MINGW)
   set(MINGW 1)
 endif()
 set(CMAKE_C_COMPILER_ID_RUN 1)
-set(CMAKE_C_SOURCE_FILE_EXTENSIONS c)
+set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m)
 set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)
 set(CMAKE_C_LINKER_PREFERENCE 10)
 
diff --git a/Modules/CMakeCXXCompiler.cmake.in b/Modules/CMakeCXXCompiler.cmake.in
index 35aa6c4..c75611a 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -27,7 +27,7 @@ if(CMAKE_COMPILER_IS_MINGW)
 endif()
 set(CMAKE_CXX_COMPILER_ID_RUN 1)
 set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC)
-set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;CPP)
+set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;mm;CPP)
 set(CMAKE_CXX_LINKER_PREFERENCE 30)
 set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1)
 

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

Summary of changes:
 Modules/CMakeCCompiler.cmake.in   |    2 +-
 Modules/CMakeCXXCompiler.cmake.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake