[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3643-gdd1ce58

[Rolf Eike Beer]

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  dd1ce587c595a6fa077c2354b0abd74de5667b0b (commit)
       via  b098ab53be9220b46d3cc88fe9b60abb6875bae6 (commit)
      from  05de63408226047f3751937d37525f8121f04429 (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=dd1ce587c595a6fa077c2354b0abd74de5667b0b
commit dd1ce587c595a6fa077c2354b0abd74de5667b0b
Merge: 05de634 b098ab5
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Aug 3 08:12:26 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 3 08:12:26 2013 -0400

    Merge topic 'cxx11' into next
    
    b098ab5 CXXFeatures: update expected g++ results


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b098ab53be9220b46d3cc88fe9b60abb6875bae6
commit b098ab53be9220b46d3cc88fe9b60abb6875bae6
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Aug 3 14:09:59 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Aug 3 14:11:50 2013 +0200

    CXXFeatures: update expected g++ results

diff --git a/Tests/Module/CXXFeatures/CMakeLists.txt b/Tests/Module/CXXFeatures/CMakeLists.txt
index 7296c35..2242cda 100644
--- a/Tests/Module/CXXFeatures/CMakeLists.txt
+++ b/Tests/Module/CXXFeatures/CMakeLists.txt
@@ -35,23 +35,31 @@ if (CMAKE_COMPILER_IS_GNUCXX)
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
         set(_expected_features ${_all_cxx_features})
         set(_expected_cxx11_flag "-std=c++11")
-    elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
-        list(APPEND _expected_features
-             CXXFeatures_auto_FOUND
-             CXXFeatures_constexpr_FOUND
-             CXXFeatures_cstdint_header_FOUND
-             CXXFeatures_decltype_FOUND
-             CXXFeatures_defaulted_functions_FOUND
-             CXXFeatures_deleted_functions_FOUND
-             CXXFeatures_initializer_list_FOUND
-             CXXFeatures_lambda_FOUND
-             CXXFeatures_nullptr_FOUND
-             CXXFeatures_rvalue_references_FOUND
-             CXXFeatures_sizeof_member_FOUND
-             CXXFeatures_static_assert_FOUND
-             CXXFeatures_variadic_templates_FOUND)
     elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.3)
         set(_expected_cxx11_flag "-std=c++0x")
+        if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
+            list(APPEND _expected_features
+                CXXFeatures_nullptr_FOUND)
+        endif ()
+        if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.5)
+            list(APPEND _expected_features
+                CXXFeatures_lambda_FOUND)
+        endif ()
+        if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
+            list(APPEND _expected_features
+                CXXFeatures_auto_FOUND
+                CXXFeatures_constexpr_FOUND
+                CXXFeatures_cstdint_header_FOUND
+                CXXFeatures_defaulted_functions_FOUND
+                CXXFeatures_deleted_functions_FOUND
+                CXXFeatures_initializer_list_FOUND
+                CXXFeatures_sizeof_member_FOUND)
+        endif ()
+        list(APPEND _expected_features
+                CXXFeatures_decltype_FOUND
+                CXXFeatures_rvalue_references_FOUND
+                CXXFeatures_static_assert_FOUND
+                CXXFeatures_variadic_templates_FOUND)
     endif ()
 elseif (MSVC)
     if (NOT MSVC_VERSION VERSION_LESS 1700)

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

Summary of changes:
 Tests/Module/CXXFeatures/CMakeLists.txt |   38 ++++++++++++++++++------------
 1 files changed, 23 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake