[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-582-gb4ef17f

[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  b4ef17f26419a00dc6cad0e9c9319d1983235a0b (commit)
       via  0a0051546bf34d2010b2b4c5f2b3893d25150f53 (commit)
       via  73c75c5c88f99cfdb1adfd40a8a85e39d6f641a3 (commit)
      from  736fffcd624efb2c3b95a25d36437ecbf3b03839 (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=b4ef17f26419a00dc6cad0e9c9319d1983235a0b
commit b4ef17f26419a00dc6cad0e9c9319d1983235a0b
Merge: 736fffc 0a00515
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 12 16:39:32 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 12 16:39:32 2014 -0500

    Merge topic 'compile-features-refactor' into next
    
    0a005154 Features: Run GNU feature tests with std=c++14 when available.
    73c75c5c Features: Use the correct dialect flag when recording features.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a0051546bf34d2010b2b4c5f2b3893d25150f53
commit 0a0051546bf34d2010b2b4c5f2b3893d25150f53
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 11 23:11:17 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 12 22:38:54 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 1050679..422bacd 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()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73c75c5c88f99cfdb1adfd40a8a85e39d6f641a3
commit 73c75c5c88f99cfdb1adfd40a8a85e39d6f641a3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 11 23:06:03 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 12 22:38:54 2014 +0100

    Features: Use the correct dialect flag when recording features.
    
    Avoid using -std=c++1y for compilers which support -std=c++14, for
    example.

diff --git a/Modules/Compiler/Clang-CXX.cmake b/Modules/Compiler/Clang-CXX.cmake
index 5dd7b4a..780a072 100644
--- a/Modules/Compiler/Clang-CXX.cmake
+++ b/Modules/Compiler/Clang-CXX.cmake
@@ -35,16 +35,16 @@ set(CMAKE_CXX_STANDARD_DEFAULT 98)
 
 macro(cmake_record_cxx_compile_features)
   macro(_get_clang_features std_version list)
-    record_compiler_features(CXX "-std=${std_version}" ${list})
+    record_compiler_features(CXX "${std_version}" ${list})
   endmacro()
 
   if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
-    _get_clang_features(c++1y CMAKE_CXX14_COMPILE_FEATURES)
+    _get_clang_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
     if (_result EQUAL 0)
-      _get_clang_features(c++11 CMAKE_CXX11_COMPILE_FEATURES)
+      _get_clang_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
     endif()
     if (_result EQUAL 0)
-      _get_clang_features(c++98 CMAKE_CXX98_COMPILE_FEATURES)
+      _get_clang_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES)
     endif()
   else()
     set(_result 0)
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 14dc76a..1050679 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -33,19 +33,19 @@ set(CMAKE_CXX_STANDARD_DEFAULT 98)
 
 macro(cmake_record_cxx_compile_features)
   macro(_get_gcc_features std_version list)
-    record_compiler_features(CXX "-std=${std_version}" ${list})
+    record_compiler_features(CXX "${std_version}" ${list})
   endmacro()
 
   set(_result 0)
   if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
-    _get_gcc_features(c++1y CMAKE_CXX14_COMPILE_FEATURES)
+    _get_gcc_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES)
   endif()
   if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
     if (_result EQUAL 0)
-      _get_gcc_features(c++11 CMAKE_CXX11_COMPILE_FEATURES)
+      _get_gcc_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES)
     endif()
     if (_result EQUAL 0)
-      _get_gcc_features(c++98 CMAKE_CXX98_COMPILE_FEATURES)
+      _get_gcc_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES)
     endif()
   else()
     set(_result 0)

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

Summary of changes:


hooks/post-receive
-- 
CMake