[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3647-g888359b

[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  888359b8434cc55fa0f09ac6327eb281c6e30191 (commit)
       via  b5ec5b8c0a7cc8ee006477366622a74d7d0e6524 (commit)
      from  3a9db6178253b149b7723076914c1606d2ed7e7e (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=888359b8434cc55fa0f09ac6327eb281c6e30191
commit 888359b8434cc55fa0f09ac6327eb281c6e30191
Merge: 3a9db61 b5ec5b8
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Aug 4 06:50:31 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Aug 4 06:50:31 2013 -0400

    Merge topic 'cxx11' into next
    
    b5ec5b8 CXXFeatures: clean up test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b5ec5b8c0a7cc8ee006477366622a74d7d0e6524
commit b5ec5b8c0a7cc8ee006477366622a74d7d0e6524
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Aug 4 12:50:04 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Aug 4 12:50:04 2013 +0200

    CXXFeatures: clean up test

diff --git a/Tests/Module/CXXFeatures/CMakeLists.txt b/Tests/Module/CXXFeatures/CMakeLists.txt
index 50f9185..cba1358 100644
--- a/Tests/Module/CXXFeatures/CMakeLists.txt
+++ b/Tests/Module/CXXFeatures/CMakeLists.txt
@@ -33,11 +33,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
          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.3)
+    if (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.7)
+            set(_expected_cxx11_flag "-std=c++11")
+            list(APPEND _expected_features
+                 CXXFeatures_class_override_final_FOUND)
+        endif ()
         if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
             list(APPEND _expected_features
                  CXXFeatures_nullptr_FOUND)
@@ -95,13 +97,11 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "XL")
              CXXFeatures_decltype_FOUND
              CXXFeatures_static_assert_FOUND
              CXXFeatures_variadic_templates_FOUND)
-              )
     endif ()
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
         list(APPEND _expected_features
              CXXFeatures_constexpr_FOUND
              CXXFeatures_rvalue_references_FOUND)
-              )
     endif ()
 else ()
     message(WARNING "Your C++ compiler configuration is not in the list of known configurations")

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

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


hooks/post-receive
-- 
CMake