[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2926-ga106f5a

Stephen Kelly steveire at gmail.com
Wed May 7 06:41:23 EDT 2014


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  a106f5a2bcece7f39b17b5d0bbe44ae6168885e3 (commit)
       via  aa283b6b0137dad796af2e5c58912783790cc849 (commit)
      from  6f923c8b1519d3d95c2c4fed2b2cd505a657c2bd (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=a106f5a2bcece7f39b17b5d0bbe44ae6168885e3
commit a106f5a2bcece7f39b17b5d0bbe44ae6168885e3
Merge: 6f923c8 aa283b6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 7 06:41:22 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 7 06:41:22 2014 -0400

    Merge topic 'minor-cleanups' into next
    
    aa283b6b Features: Fix test for GNU 4.8.1.

diff --cc Modules/Compiler/GNU-CXX-FeatureTests.cmake
index b19ee49,3aeb27f..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")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa283b6b0137dad796af2e5c58912783790cc849
commit aa283b6b0137dad796af2e5c58912783790cc849
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed May 7 12:40:42 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed May 7 12:40:42 2014 +0200

    Features: Fix test for GNU 4.8.1.

diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake
index fe0ff0b..3aeb27f 100644
--- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake
+++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake
@@ -3,7 +3,7 @@
 
 set(_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 408")
 # 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")

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

Summary of changes:
 Modules/Compiler/GNU-CXX-FeatureTests.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list