[Cmake-commits] CMake branch, next, updated. v3.1.0-2109-ge33e646

[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  e33e646f3cad70b68ec9c47b9da3ce5c991e87eb (commit)
       via  aed26795976e7c81b15fd89ec23fe0afe8c47593 (commit)
      from  446f851e1e87e24b0a60601a8fc20b52f58659d7 (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=e33e646f3cad70b68ec9c47b9da3ce5c991e87eb
commit e33e646f3cad70b68ec9c47b9da3ce5c991e87eb
Merge: 446f851 aed2679
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 18 08:46:15 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 18 08:46:15 2015 -0500

    Merge topic 'GNU-4.4-compile-features' into next
    
    aed26795 Fix version.

diff --cc Tests/CompileFeatures/CMakeLists.txt
index fb5f042,ccd6f30..5cd0836
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@@ -51,19 -51,8 +51,19 @@@ 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)
+     AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
    # 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

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

    Fix version.

diff --git a/Tests/CompileFeatures/CMakeLists.txt b/Tests/CompileFeatures/CMakeLists.txt
index e086032..ccd6f30 100644
--- a/Tests/CompileFeatures/CMakeLists.txt
+++ b/Tests/CompileFeatures/CMakeLists.txt
@@ -52,7 +52,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"
 endif()
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-    AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
+    AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
   # 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

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

Summary of changes:
 Tests/CompileFeatures/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake