[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3662-g5898ff8

[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  5898ff8bb8fc3996a51ea576d25774c117e3ab9e (commit)
       via  4f9ab30b77c06a3bf1c6812d459a1f91d85b58ce (commit)
      from  d5dc2a6a9feef15674d42cd1ade400ec7bac4b59 (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=5898ff8bb8fc3996a51ea576d25774c117e3ab9e
commit 5898ff8bb8fc3996a51ea576d25774c117e3ab9e
Merge: d5dc2a6 4f9ab30
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Aug 5 02:04:30 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 5 02:04:30 2013 -0400

    Merge topic 'cxx11' into next
    
    4f9ab30 CXXFeatures: update expected features


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f9ab30b77c06a3bf1c6812d459a1f91d85b58ce
commit 4f9ab30b77c06a3bf1c6812d459a1f91d85b58ce
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Aug 5 07:59:23 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Aug 5 08:03:08 2013 +0200

    CXXFeatures: update expected features
    
    -BCC support long long
    -g++ seems to support constexpr since 4.5 even if their support page says 4.6

diff --git a/Tests/Module/CXXFeatures/CMakeLists.txt b/Tests/Module/CXXFeatures/CMakeLists.txt
index 1a476c5..744669a 100644
--- a/Tests/Module/CXXFeatures/CMakeLists.txt
+++ b/Tests/Module/CXXFeatures/CMakeLists.txt
@@ -44,11 +44,11 @@ if (CMAKE_COMPILER_IS_GNUCXX)
         endif ()
         if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6)
             list(APPEND _expected_features
-                 CXXFeatures_constexpr_FOUND
                  CXXFeatures_nullptr_FOUND)
         endif ()
         if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.5)
             list(APPEND _expected_features
+                 CXXFeatures_constexpr_FOUND
                  CXXFeatures_lambda_FOUND)
         endif ()
         if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
@@ -86,7 +86,8 @@ elseif (MSVC)
              CXXFeatures_long_long_FOUND)
     endif ()
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Borland")
-    # nothing supported
+    list(APPEND _expected_features
+         CXXFeatures_long_long_FOUND)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "XL")
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.1)
         set(_expected_cxx11_flag "-qlanglvl=extended0x")

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

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


hooks/post-receive
-- 
CMake