[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3924-gf1d51b9

[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  f1d51b9d437b5f9455a88ea34dfcc3abd4ac627a (commit)
       via  588a70ab913f27f700ff517d915f3f25a7a1c5d9 (commit)
      from  6abd6179cf6f3266c305c8a40f3d4d04e346941b (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=f1d51b9d437b5f9455a88ea34dfcc3abd4ac627a
commit f1d51b9d437b5f9455a88ea34dfcc3abd4ac627a
Merge: 6abd617 588a70a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Aug 17 12:31:52 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 17 12:31:52 2013 -0400

    Merge topic 'cxx11' into next
    
    588a70a CXXFeatures: nullptr is in Clang 3.0


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=588a70ab913f27f700ff517d915f3f25a7a1c5d9
commit 588a70ab913f27f700ff517d915f3f25a7a1c5d9
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sat Aug 17 16:37:52 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sat Aug 17 18:31:33 2013 +0200

    CXXFeatures: nullptr is in Clang 3.0

diff --git a/Tests/Module/FindCXXFeatures/CMakeLists.txt b/Tests/Module/FindCXXFeatures/CMakeLists.txt
index 792721c..b2e1bd3 100644
--- a/Tests/Module/FindCXXFeatures/CMakeLists.txt
+++ b/Tests/Module/FindCXXFeatures/CMakeLists.txt
@@ -243,15 +243,15 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
          set(_expected_cxx11_flag "-std=c++11")
          list(APPEND _expected_features
              defaulted_functions
-             delegating_constructors)
+             delegating_constructors
+             nullptr)
     endif ()
     if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.1)
          set(_expected_cxx11_flag "-std=c++11")
          list(APPEND _expected_features
              cstdint_header
              initializer_list
-             lambda
-             nullptr)
+             lambda)
     endif ()
 else ()
     message(STATUS "CTEST_FULL_OUTPUT")

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

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


hooks/post-receive
-- 
CMake