[Cmake-commits] CMake branch, master, updated. v3.1.0-rc2-335-g47f1020

[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, master has been updated
       via  47f1020b5446b9913198995cbcc21247896670d0 (commit)
       via  c03c184be015649cf049ce3fd11f907f3d46036b (commit)
      from  cbec5c0445eb48d88d70abae77c0c0a8debd6a41 (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=47f1020b5446b9913198995cbcc21247896670d0
commit 47f1020b5446b9913198995cbcc21247896670d0
Merge: cbec5c0 c03c184
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 25 10:18:42 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 25 10:18:42 2014 -0500

    Merge topic 'fix-GNU-CXX-dialect-versions'
    
    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()

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

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


hooks/post-receive
-- 
CMake