[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-741-g3257a37

[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  3257a375975e9ddf5719a3f95312a00c6833fce6 (commit)
       via  c03c184be015649cf049ce3fd11f907f3d46036b (commit)
      from  58f262804f3db7d2b0b18bddf2825c0e28818382 (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=3257a375975e9ddf5719a3f95312a00c6833fce6
commit 3257a375975e9ddf5719a3f95312a00c6833fce6
Merge: 58f2628 c03c184
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 19 03:40:21 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 19 03:40:21 2014 -0500

    Merge topic 'fix-GNU-CXX-dialect-versions' into next
    
    c03c184b Features: Record C++11 dialect switch only for GNU 4.7 and later.

diff --cc Modules/Compiler/GNU-CXX.cmake
index 422bacd,4129a38..a91c901
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@@ -19,15 -20,10 +20,13 @@@ endif(
  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
    set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
    set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
- elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
-   set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++0x")
-   set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x")
+   # 4.3 supports 0x variants
  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=c03c184be015649cf049ce3fd11f907f3d46036b
commit c03c184be015649cf049ce3fd11f907f3d46036b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 19 09:37:21 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 19 09:39:44 2014 +0100

    Features: Record C++11 dialect switch only for GNU 4.7 and later.
    
    Previous versions of GNU are not currently supported by this
    CMake feature.

diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 14dc76a..4129a38 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -11,7 +11,8 @@ else()
   endif()
 endif()
 
-if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
+if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
+  # Supported since 4.3
   set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "-std=c++98")
   set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "-std=gnu++98")
 endif()
@@ -19,9 +20,7 @@ endif()
 if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
   set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++11")
   set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++11")
-elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
-  set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-std=c++0x")
-  set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-std=gnu++0x")
+  # 4.3 supports 0x variants
 endif()
 
 if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)

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

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


hooks/post-receive
-- 
CMake