[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3641-g05de634

[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  05de63408226047f3751937d37525f8121f04429 (commit)
       via  124c4a24d79fb36a3a10edb6c39d552d56815951 (commit)
      from  ed99079835905ab44e701ae4f36dea9428db2343 (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=05de63408226047f3751937d37525f8121f04429
commit 05de63408226047f3751937d37525f8121f04429
Merge: ed99079 124c4a2
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Aug 3 01:28:06 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 3 01:28:06 2013 -0400

    Merge topic 'cxx11' into next
    
    124c4a2 CXXFeatures: update list of expected compiler features


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=124c4a24d79fb36a3a10edb6c39d552d56815951
commit 124c4a24d79fb36a3a10edb6c39d552d56815951
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Aug 3 07:27:57 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Aug 3 07:27:57 2013 +0200

    CXXFeatures: update list of expected compiler features

diff --git a/Tests/Module/CXXFeatures/CMakeLists.txt b/Tests/Module/CXXFeatures/CMakeLists.txt
index 5091838..7296c35 100644
--- a/Tests/Module/CXXFeatures/CMakeLists.txt
+++ b/Tests/Module/CXXFeatures/CMakeLists.txt
@@ -27,34 +27,53 @@ unset(_expected_cxx11_flag)
 unset(_compiler_unknown_features)
 
 if (CMAKE_COMPILER_IS_GNUCXX)
+    # no idea since when this is supported, but it is at least
+    # supported since 3.1
+    set(_expected_features CXXFeatures_long_long_FOUND
+                           CXXFeatures_func_identifier_FOUND)
+
     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_features CXXFeatures_long_long_FOUND
-                               CXXFeatures_func_identifier_FOUND)
         set(_expected_cxx11_flag "-std=c++0x")
-    else ()
-        # no idea since when this is supported, but it is at least
-        # supported since 3.1
-        set(_expected_features CXXFeatures_long_long_FOUND
-                               CXXFeatures_func_identifier_FOUND)
-        set(_expected_cxx11_flag "")
     endif ()
 elseif (MSVC)
-    set(_expected_cxx11_flag "")
+    if (NOT MSVC_VERSION VERSION_LESS 1700)
+        list(APPEND _expected_features
+             CXXFeatures_class_override_final_FOUND)
+    endif ()
     if (NOT MSVC_VERSION VERSION_LESS 1600)
-        set(_expected_features CXXFeatures_auto_FOUND
-                               CXXFeatures_cstdint_header_FOUND
-                               CXXFeatures_decltype_FOUND
-                               CXXFeatures_lambda_FOUND
-                               CXXFeatures_long_long_FOUND
-                               CXXFeatures_nullptr_FOUND
-                               CXXFeatures_rvalue_references_FOUND
-                               CXXFeatures_static_assert_FOUND)
-    else (NOT MSVC_VERSION VERSION_LESS 1301)
-        set(_expected_features CXXFeatures_long_long_FOUND)
+        list(APPEND _expected_features
+             CXXFeatures_auto_FOUND
+             CXXFeatures_cstdint_header_FOUND
+             CXXFeatures_decltype_FOUND
+             CXXFeatures_lambda_FOUND
+             CXXFeatures_nullptr_FOUND
+             CXXFeatures_rvalue_references_FOUND
+             CXXFeatures_static_assert_FOUND)
+    endif ()
+    if (NOT MSVC_VERSION VERSION_LESS 1301)
+        list(APPEND _expected_features
+             CXXFeatures_long_long_FOUND)
     endif ()
+elseif (CMAKE_CXX_COMPILER_ID MATCHES Borland)
+    # nothing supported
 else ()
     message(WARNING "Your C++ compiler configuration is not in the list of known configurations")
     set(_compiler_unknown_features TRUE)

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

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


hooks/post-receive
-- 
CMake