[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3773-gf846081

[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  f846081a5fb62555506644cf3e52f0136a50fcdb (commit)
       via  9cab95f9dd428f1a6b6b29e9d078ba56909a3eae (commit)
      from  a420242c8343323aa8b349809646faf4d30eafae (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=f846081a5fb62555506644cf3e52f0136a50fcdb
commit f846081a5fb62555506644cf3e52f0136a50fcdb
Merge: a420242 9cab95f
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Aug 8 03:00:36 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 8 03:00:36 2013 -0400

    Merge topic 'cxx11' into next
    
    9cab95f CXXFeatures: expected results for PGI, SunPro, and Intel


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cab95f9dd428f1a6b6b29e9d078ba56909a3eae
commit 9cab95f9dd428f1a6b6b29e9d078ba56909a3eae
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Aug 8 09:00:23 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Aug 8 09:00:23 2013 +0200

    CXXFeatures: expected results for PGI, SunPro, and Intel

diff --git a/Tests/Module/CXXFeatures/CMakeLists.txt b/Tests/Module/CXXFeatures/CMakeLists.txt
index a8932c3..b7cf9f7 100644
--- a/Tests/Module/CXXFeatures/CMakeLists.txt
+++ b/Tests/Module/CXXFeatures/CMakeLists.txt
@@ -111,6 +111,60 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "XL")
              CXXFeatures_constexpr_FOUND
              CXXFeatures_rvalue_references_FOUND)
     endif ()
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
+    # values found by looking on the test output, may be present much longer
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.9)
+        list(APPEND _expected_features
+             CXXFeatures_long_long_FOUND
+             CXXFeatures_sizeof_member_FOUND)
+    endif ()
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "PGI")
+    # values found by looking on the test output, may be present much longer
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.3)
+        list(APPEND _expected_features
+             CXXFeatures_func_identifier_FOUND
+             CXXFeatures_long_long_FOUND)
+    endif ()
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+    # FIXME: newer version support -std=c++11, Windows has /Q flag
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.1)
+        set(_expected_cxx11_flag "-std=c++0x")
+        list(APPEND _expected_features
+             CXXFeatures_func_identifier_FOUND
+             CXXFeatures_long_long_FOUND
+             CXXFeatures_static_assert_FOUND)
+    endif ()
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12)
+        list(APPEND _expected_features
+             CXXFeatures_auto_FOUND
+             CXXFeatures_decltype_FOUND
+             CXXFeatures_defaulted_functions_FOUND
+             CXXFeatures_deleted_functions_FOUND
+             CXXFeatures_func_identifier_FOUND
+             CXXFeatures_lambda_FOUND
+             CXXFeatures_long_long_FOUND
+             CXXFeatures_rvalue_references_FOUND
+             CXXFeatures_sizeof_member_FOUND
+             CXXFeatures_static_assert_FOUND)
+    endif ()
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
+        list(APPEND _expected_features
+             CXXFeatures_variadic_templates_FOUND)
+    endif ()
+    # constexpr is partially supported in version 13, it may
+    # already show up for this version depending on the check file.
+    # The same applies to initializer lists.
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13)
+        list(APPEND _expected_features
+             CXXFeatures_nullptr_FOUND)
+    endif ()
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14)
+        list(APPEND _expected_features
+             CXXFeatures_class_override_final_FOUND
+             CXXFeatures_constexpr_FOUND
+             CXXFeatures_delegating_constructors_FOUND
+             CXXFeatures_initializer_list_FOUND)
+    endif ()
 else ()
     message(STATUS "CTEST_FULL_OUTPUT")
     message(WARNING "Your C++ compiler configuration is not in the list of known configurations")

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

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


hooks/post-receive
-- 
CMake