[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-771-g5c5d83c

[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  5c5d83c996d5cbbee6d57b1b09f41a24f7e809b8 (commit)
       via  f327a9fd26a24b2aaf609a9b3d34258c7a992bb3 (commit)
      from  7ca9ac40d619d48792f5c2cc35c4c2ca6dd5fef4 (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=5c5d83c996d5cbbee6d57b1b09f41a24f7e809b8
commit 5c5d83c996d5cbbee6d57b1b09f41a24f7e809b8
Merge: 7ca9ac4 f327a9f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 20 16:13:06 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 20 16:13:06 2014 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f327a9fd26a24b2aaf609a9b3d34258c7a992bb3
commit f327a9fd26a24b2aaf609a9b3d34258c7a992bb3
Merge: 3a20cef 36bb100
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 20 22:11:56 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 20 22:11:56 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