[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-533-g8bb140b

[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  8bb140b9caa41c5ac5a668e7f8f422eef0f36f19 (commit)
       via  9d3102ca2bf3623efc64a9d04767be0e8b80932f (commit)
      from  a8220764822a8374a7fdae62b7357e4fa9380174 (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=8bb140b9caa41c5ac5a668e7f8f422eef0f36f19
commit 8bb140b9caa41c5ac5a668e7f8f422eef0f36f19
Merge: a822076 9d3102c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 11 17:12:08 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 11 17:12:08 2014 -0500

    Merge topic 'compile-features-refactor' into next
    
    9d3102ca Features: Run GNU feature tests with std=c++14 when available.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d3102ca2bf3623efc64a9d04767be0e8b80932f
commit 9d3102ca2bf3623efc64a9d04767be0e8b80932f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 11 23:11:17 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 11 23:11:17 2014 +0100

    Features: Run GNU feature tests with std=c++14 when available.

diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 25a7b1e..9aeee59 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -24,7 +24,10 @@ elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
   set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x")
 endif()
 
-if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+  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 4.8)
   set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-std=c++1y")
   set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-std=gnu++1y")
 endif()

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

Summary of changes:
 Modules/Compiler/GNU-CXX.cmake |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake