[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3965-g7742930
Rolf Eike Beer
eike at sf-mail.de
Thu Aug 22 16:45:16 EDT 2013
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 774293083ca32a70d9dde621931eb81096d314e2 (commit)
via ca947a14da00e2a1e36ebfb97fedec2e97f73787 (commit)
from f4e4f4542ed8510dfb3040b1cf26ef7f1525075e (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=774293083ca32a70d9dde621931eb81096d314e2
commit 774293083ca32a70d9dde621931eb81096d314e2
Merge: f4e4f45 ca947a1
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Aug 22 16:45:15 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 22 16:45:15 2013 -0400
Merge topic 'cxx11' into next
ca947a1 CXXFeatures: allow lambda to fail on Clang 3.1
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca947a14da00e2a1e36ebfb97fedec2e97f73787
commit ca947a14da00e2a1e36ebfb97fedec2e97f73787
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Aug 22 22:44:50 2013 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Aug 22 22:44:50 2013 +0200
CXXFeatures: allow lambda to fail on Clang 3.1
diff --git a/Tests/Module/FindCXXFeatures/CMakeLists.txt b/Tests/Module/FindCXXFeatures/CMakeLists.txt
index dce1e0a..6b60954 100644
--- a/Tests/Module/FindCXXFeatures/CMakeLists.txt
+++ b/Tests/Module/FindCXXFeatures/CMakeLists.txt
@@ -250,7 +250,13 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(_expected_cxx11_flag "-std=c++11")
list(APPEND _expected_features
cstdint_header
- initializer_list
+ initializer_list)
+ endif ()
+ # Clang supports lambda since 3.1, but at least the version shipped with
+ # MacOS 10.7 crashes with our testcase, so this support wouldn't be reliable.
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.2)
+ set(_expected_cxx11_flag "-std=c++11")
+ list(APPEND _expected_features
lambda)
endif ()
else ()
-----------------------------------------------------------------------
Summary of changes:
Tests/Module/FindCXXFeatures/CMakeLists.txt | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list