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  664858e81eff9eb60278c3810638ce72a258e088 (commit)
       via  9fe399e3894dccce158b445c9ec4f2253035eaa0 (commit)
      from  21d0df2c519548c8fe752002e37bc2958f99f4b9 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=664858e81eff9eb60278c3810638ce72a258e088
commit 664858e81eff9eb60278c3810638ce72a258e088
Merge: 21d0df2 9fe399e
Author:     Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 12 15:46:48 2017 -0500
Commit:     CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jan 12 15:46:48 2017 -0500

    Merge topic 'clang-3.1-3.3-cpp11' into next
    
    9fe399e3 Features: activate C++11 support for Clang 3.1+


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fe399e3894dccce158b445c9ec4f2253035eaa0
commit 9fe399e3894dccce158b445c9ec4f2253035eaa0
Author:     Giel van Schijndel <giel.vanschijn...@tomtom.com>
AuthorDate: Thu Jan 12 14:13:53 2017 +0100
Commit:     Giel van Schijndel <giel.vanschijn...@tomtom.com>
CommitDate: Thu Jan 12 17:16:34 2017 +0100

    Features: activate C++11 support for Clang 3.1+

diff --git a/Modules/Compiler/Clang-CXX-FeatureTests.cmake 
b/Modules/Compiler/Clang-CXX-FeatureTests.cmake
index df2e1a8..cd04190 100644
--- a/Modules/Compiler/Clang-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/Clang-CXX-FeatureTests.cmake
@@ -2,7 +2,7 @@
 # Reference: http://clang.llvm.org/cxx_status.html
 # http://clang.llvm.org/docs/LanguageExtensions.html
 
-set(_cmake_oldestSupported "((__clang_major__ * 100) + __clang_minor__) >= 
304")
+set(_cmake_oldestSupported "((__clang_major__ * 100) + __clang_minor__) >= 
301")
 
 include("${CMAKE_CURRENT_LIST_DIR}/Clang-CXX-TestableFeatures.cmake")
 
@@ -15,7 +15,6 @@ set(_cmake_feature_test_cxx_digit_separators 
"${Clang34_CXX14}")
 # http://llvm.org/bugs/show_bug.cgi?id=19674
 set(_cmake_feature_test_cxx_generic_lambdas "${Clang34_CXX14}")
 
-# TODO: Should be supported by Clang 3.1
 set(Clang31_CXX11 "${_cmake_oldestSupported} && __cplusplus >= 201103L")
 set(_cmake_feature_test_cxx_enum_forward_declarations "${Clang31_CXX11}")
 set(_cmake_feature_test_cxx_sizeof_member "${Clang31_CXX11}")
diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index d0e2521..8ed3695 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -36,7 +36,7 @@ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
   set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-std=gnu++1z")
 endif()
 
-if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.1)
   if (NOT CMAKE_CXX_COMPILER_FORCED)
     if (NOT CMAKE_CXX_STANDARD_COMPUTED_DEFAULT)
       message(FATAL_ERROR "CMAKE_CXX_STANDARD_COMPUTED_DEFAULT should be set 
for ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) version 
${CMAKE_CXX_COMPILER_VERSION}")
@@ -50,14 +50,14 @@ endif()
 
 macro(cmake_record_cxx_compile_features)
   set(_result 0)
-  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
+  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.1)
     if(_result EQUAL 0 AND CMAKE_CXX17_STANDARD_COMPILE_OPTION)
       _record_compiler_features_cxx(17)
     endif()
     if(_result EQUAL 0 AND CMAKE_CXX14_STANDARD_COMPILE_OPTION)
       _record_compiler_features_cxx(14)
     endif()
-    if (_result EQUAL 0)
+    if (_result EQUAL 0 AND CMAKE_CXX11_STANDARD_COMPILE_OPTION)
       _record_compiler_features_cxx(11)
     endif()
     if (_result EQUAL 0)

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

Summary of changes:
 Modules/Compiler/Clang-CXX-FeatureTests.cmake |    3 +--
 Modules/Compiler/Clang-CXX.cmake              |    6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

Reply via email to