[Cmake-commits] CMake branch, next, updated. v3.1.0-2107-g446f851

[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  446f851e1e87e24b0a60601a8fc20b52f58659d7 (commit)
       via  dc9a621e83c391d80274d6f99f5098500a0bf88e (commit)
      from  48ff2e8cee3b0f28f2e65b59092682daa3930c45 (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=446f851e1e87e24b0a60601a8fc20b52f58659d7
commit 446f851e1e87e24b0a60601a8fc20b52f58659d7
Merge: 48ff2e8 dc9a621
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 18 08:44:53 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 18 08:44:53 2015 -0500

    Merge topic 'GNU-4.4-compile-features' into next
    
    dc9a621e Features: Blacklist cxx_constexpr test for GNU 4.5.

diff --cc Tests/CompileFeatures/CMakeLists.txt
index c55856e,e086032..fb5f042
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@@ -51,18 -51,15 +51,26 @@@ if (CMAKE_CXX_COMPILER_ID STREQUAL "App
    )
  endif()
  
 +if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
 +  list(REMOVE_ITEM CXX_non_features
 +    cxx_attribute_deprecated
 +    cxx_contextual_conversions
 +    cxx_extended_friend_declarations
 +    cxx_long_long_type
 +    cxx_sizeof_member
 +    cxx_variadic_macros
 +  )
 +endif()
 +
  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+     AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
+   # The cxx_constexpr feature happens to work (for *this* testcase) with
+   # GNU 4.5, but it is first documented as available with GNU 4.6.
+   list(REMOVE_ITEM CXX_non_features
+     cxx_constexpr
+   )
+ endif()
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
      AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
    # The cxx_alignof feature happens to work (for *this* testcase) with
    # GNU 4.7, but it is first documented as available with GNU 4.8.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc9a621e83c391d80274d6f99f5098500a0bf88e
commit dc9a621e83c391d80274d6f99f5098500a0bf88e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 18 14:44:13 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jan 18 14:44:13 2015 +0100

    Features: Blacklist cxx_constexpr test for GNU 4.5.

diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index 9de0da2..e086032 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -52,6 +52,14 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"
 endif()
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+    AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
+  # The cxx_constexpr feature happens to work (for *this* testcase) with
+  # GNU 4.5, but it is first documented as available with GNU 4.6.
+  list(REMOVE_ITEM CXX_non_features
+    cxx_constexpr
+  )
+endif()
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
     AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
   # The cxx_alignof feature happens to work (for *this* testcase) with
   # GNU 4.7, but it is first documented as available with GNU 4.8.

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

Summary of changes:
 Tests/CompileFeatures/CMakeLists.txt |    8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
CMake