[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-767-gd8e425c

[Stephen Kelly]

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  d8e425c37bb9c0a3b3bba8651eedc3646c421067 (commit)
       via  7591d9844de80652b56d88a99d1a718c941e7d8b (commit)
      from  eeb0de0af58f287c5c03a2a2655bdc2af404feb5 (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=d8e425c37bb9c0a3b3bba8651eedc3646c421067
commit d8e425c37bb9c0a3b3bba8651eedc3646c421067
Merge: eeb0de0 7591d98
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 20 16:02:20 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 20 16:02:20 2014 -0500

    Merge topic 'default-lang-dialect-for-master' into next
    
    7591d984 Merge branch 'default-lang-dialect' into step2


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7591d9844de80652b56d88a99d1a718c941e7d8b
commit 7591d9844de80652b56d88a99d1a718c941e7d8b
Merge: 3a20cef a3d0ae1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 20 22:00:48 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 20 22:00:48 2014 +0100

    Merge branch 'default-lang-dialect' into step2
    
    Conflicts:
    	Modules/Compiler/Clang-C.cmake

diff --cc Modules/Compiler/Clang-C.cmake
index 92119ba,d504d69..ebd5c43
--- a/Modules/Compiler/Clang-C.cmake
+++ b/Modules/Compiler/Clang-C.cmake
@@@ -21,16 -25,16 +25,16 @@@ endif(
  
  macro(cmake_record_c_compile_features)
    macro(_get_clang_features std_version list)
 -    record_compiler_features(C "-std=${std_version}" ${list})
 +    record_compiler_features(C "${std_version}" ${list})
    endmacro()
  
-   if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
+   if (UNIX AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
 -    _get_clang_features(c11 CMAKE_C11_COMPILE_FEATURES)
 +    _get_clang_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES)
      if (_result EQUAL 0)
 -      _get_clang_features(c99 CMAKE_C99_COMPILE_FEATURES)
 +      _get_clang_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES)
      endif()
      if (_result EQUAL 0)
 -      _get_clang_features(c90 CMAKE_C90_COMPILE_FEATURES)
 +      _get_clang_features(${CMAKE_C90_STANDARD_COMPILE_OPTION} CMAKE_C90_COMPILE_FEATURES)
      endif()
    else()
      set(_result 0)

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

Summary of changes:


hooks/post-receive
-- 
CMake