[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3926-gb54cf86
Rolf Eike Beer
eike at sf-mail.de
Sun Aug 18 04:37:47 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 b54cf865cd1af98c095fb28387869e3a14340e60 (commit)
via b1a6a575aa031274114e159cafe5f9e800201be6 (commit)
from f1d51b9d437b5f9455a88ea34dfcc3abd4ac627a (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=b54cf865cd1af98c095fb28387869e3a14340e60
commit b54cf865cd1af98c095fb28387869e3a14340e60
Merge: f1d51b9 b1a6a57
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Aug 18 04:37:45 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Aug 18 04:37:45 2013 -0400
Merge topic 'cxx11' into next
b1a6a57 CXXFeatures: fix tests to really accept unexpected C++11 flags
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1a6a575aa031274114e159cafe5f9e800201be6
commit b1a6a575aa031274114e159cafe5f9e800201be6
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Aug 18 10:37:28 2013 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Aug 18 10:37:28 2013 +0200
CXXFeatures: fix tests to really accept unexpected C++11 flags
diff --git a/Tests/Module/FindCXXFeatures/CMakeLists.txt b/Tests/Module/FindCXXFeatures/CMakeLists.txt
index b2e1bd3..dce1e0a 100644
--- a/Tests/Module/FindCXXFeatures/CMakeLists.txt
+++ b/Tests/Module/FindCXXFeatures/CMakeLists.txt
@@ -84,7 +84,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# At least on one AIX dashboard machine the detection fails with
# gcc 2.9, looks like that didn't properly detect the flags.
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3)
- set(_compiler_unknown_flag)
+ set(_compiler_unknown_flag TRUE)
endif ()
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17)
@@ -274,7 +274,7 @@ foreach (flag IN LISTS _all_cxx_features)
list(FIND _header_on_features "${flag}" _flag_index)
if (_flag_index EQUAL -1)
message(WARNING "C++ feature '${flag}' was detected, but not expected")
- set(_compiler_unknown_flag)
+ set(_compiler_unknown_flag TRUE)
else ()
message(STATUS "C++ feature '${flag}' was detected because of additional header present")
endif ()
-----------------------------------------------------------------------
Summary of changes:
Tests/Module/FindCXXFeatures/CMakeLists.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list