[Cmake-commits] CMake branch, master, updated. v3.0.0-rc4-855-gf1d504d

[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  f1d504d6cd1812812520326171c4819febb76325 (commit)
       via  9cbc63e40caa1c3afd771d1e20c4c4c188953c00 (commit)
      from  a07b979c1c1b6e89209889f4b1fe70d0e9ca6d45 (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=f1d504d6cd1812812520326171c4819febb76325
commit f1d504d6cd1812812520326171c4819febb76325
Merge: a07b979 9cbc63e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 8 11:28:03 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 8 11:28:03 2014 -0400

    Merge topic 'GNU-4.7-features'
    
    9cbc63e4 Features: Record for GNU 4.7.

diff --cc Modules/Compiler/GNU-CXX-FeatureTests.cmake
index 3aeb27f,b19ee49..5edb69e
--- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake
@@@ -1,9 -1,9 +1,9 @@@
  
  # Reference: http://gcc.gnu.org/projects/cxx0x.html
  
- set(_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 408")
+ set(_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 407")
  # Introduced in GCC 4.8.1
 -set(GNU481_CXX11 "((__GNUC__ * 100 + __GNUC_MINOR__) > 408 || __GNUC_PATCHLEVEL__ >= 1) && __cplusplus >= 201103L")
 +set(GNU481_CXX11 "((__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __GNUC_PATCHLEVEL__ >= 1) && __cplusplus >= 201103L")
  set(_cmake_feature_test_cxx_decltype_incomplete_return_types "${GNU481_CXX11}")
  set(_cmake_feature_test_cxx_reference_qualified_functions "${GNU481_CXX11}")
  set(GNU48_CXX11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __cplusplus >= 201103L")
diff --cc Modules/Compiler/GNU-CXX.cmake
index d324985,d0de14c..1ecdad2
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@@ -29,13 -27,14 +29,13 @@@ 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})
 -    if (NOT _result EQUAL 0)
 -      return()
 -    endif()
    endmacro()
  
-   if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+   if (UNIX AND NOT APPLE AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
      _get_gcc_features(c++11 CMAKE_CXX11_COMPILE_FEATURES)
 -    _get_gcc_features(c++98 CMAKE_CXX98_COMPILE_FEATURES)
 +    if (_result EQUAL 0)
 +      _get_gcc_features(c++98 CMAKE_CXX98_COMPILE_FEATURES)
 +    endif()
    else()
      set(_result 0)
    endif()

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

Summary of changes:
 Modules/Compiler/GNU-CXX-FeatureTests.cmake |    5 ++---
 Modules/Compiler/GNU-CXX.cmake              |    2 +-
 Tests/CompileFeatures/CMakeLists.txt        |   25 ++++++++++++++++++-------
 3 files changed, 21 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake