[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-923-gb07403c

[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  b07403cb06c56ca364a1c21d9d57be0579bbca44 (commit)
       via  228643af6d8c0e29735c3fdf7b25c161a11a68c9 (commit)
      from  a0412429b1542badfdae26fbd0a4c40b4fe51001 (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=b07403cb06c56ca364a1c21d9d57be0579bbca44
commit b07403cb06c56ca364a1c21d9d57be0579bbca44
Merge: a041242 228643a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 9 09:12:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 9 09:12:52 2015 -0400

    Merge topic 'compiler-feature-AppleClang-std-flags' into next
    
    228643af AppleClang: Use modern C++14 standard flags for Apple Clang 6.1


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=228643af6d8c0e29735c3fdf7b25c161a11a68c9
commit 228643af6d8c0e29735c3fdf7b25c161a11a68c9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 8 09:25:02 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 9 09:11:57 2015 -0400

    AppleClang: Use modern C++14 standard flags for Apple Clang 6.1
    
    The Apple Clang 6.1 compiler that comes with Xcode 6.3 is aware of the
    modern -std=c++14 and -std=gnu++14 flags, so use them instead of the
    "1y" flags.
    
    Suggested-by: darkapostle at rule506.net

diff --git a/Modules/Compiler/AppleClang-CXX.cmake b/Modules/Compiler/AppleClang-CXX.cmake
index 5194da4..1ba8a77 100644
--- a/Modules/Compiler/AppleClang-CXX.cmake
+++ b/Modules/Compiler/AppleClang-CXX.cmake
@@ -13,7 +13,10 @@ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0)
   set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
 endif()
 
-if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.1)
+  set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++14")
+  set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++14")
+elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.1)
   # AppleClang 5.0 knows this flag, but does not set a __cplusplus macro greater than 201103L
   set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y")
   set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")

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

Summary of changes:


hooks/post-receive
-- 
CMake