[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-3087-gf454af5

Stephen Kelly steveire at gmail.com
Sat May 10 02:59:28 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  f454af50a0fe3c4f1001e029dd1b2568ea9abbc5 (commit)
       via  5109b0428d0145da4b71464f6c2aa51aca19cb52 (commit)
      from  c0fa1c29192da45f8f9c1d288aefc5f260b9f260 (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=f454af50a0fe3c4f1001e029dd1b2568ea9abbc5
commit f454af50a0fe3c4f1001e029dd1b2568ea9abbc5
Merge: c0fa1c2 5109b04
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 10 02:59:27 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat May 10 02:59:27 2014 -0400

    Merge topic 'minor-cleanups' into next
    
    5109b042 Features: Fix GNU 4.8.1 version test.

diff --cc Modules/Compiler/GNU-CXX-FeatureTests.cmake
index c69a520,64ddc59..c65c22c
--- 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__) >= 407")
 +set(_cmake_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__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) >= 40801) && __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=5109b0428d0145da4b71464f6c2aa51aca19cb52
commit 5109b0428d0145da4b71464f6c2aa51aca19cb52
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat May 10 08:58:49 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat May 10 08:58:49 2014 +0200

    Features: Fix GNU 4.8.1 version test.

diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake
index 0694927..64ddc59 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__) >= 407")
 # Introduced in GCC 4.8.1
-set(GNU481_CXX11 "((__GNUC__ * 100 + __GNUC_MINOR__) >= 408 && __GNUC_PATCHLEVEL__ >= 1) && __cplusplus >= 201103L")
+set(GNU481_CXX11 "((__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) >= 40801) && __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