[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3689-g1b4d3bf
Rolf Eike Beer
eike at sf-mail.de
Mon Aug 5 16:26:17 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 1b4d3bf95e2f1e37b3ac223ffab20175f996ebe9 (commit)
via 7662befc94c5802663037a42d892e906a588afdd (commit)
via 214099fd38f6c5ab6bf68591cce39f78956a121b (commit)
via 3adf4da6f81990292efea05a2c81454c3cdf7725 (commit)
from b092380bc15cb171645d2bcd5e214cd3aafe03c8 (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=1b4d3bf95e2f1e37b3ac223ffab20175f996ebe9
commit 1b4d3bf95e2f1e37b3ac223ffab20175f996ebe9
Merge: b092380 7662bef
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Aug 5 16:26:13 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 5 16:26:13 2013 -0400
Merge topic 'cxx11' into next
7662bef CXXFeatures: BCC seems to support long long only since 5.60
214099f CXXFeatures: show full outputs for unknown compilers
3adf4da CXXFeatures: 2 more add expected features for XL
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7662befc94c5802663037a42d892e906a588afdd
commit 7662befc94c5802663037a42d892e906a588afdd
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Aug 5 22:19:52 2013 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Aug 5 22:19:52 2013 +0200
CXXFeatures: BCC seems to support long long only since 5.60
diff --git a/Tests/Module/CXXFeatures/CMakeLists.txt b/Tests/Module/CXXFeatures/CMakeLists.txt
index c52c7ff..a8932c3 100644
--- a/Tests/Module/CXXFeatures/CMakeLists.txt
+++ b/Tests/Module/CXXFeatures/CMakeLists.txt
@@ -84,8 +84,10 @@ elseif (MSVC)
CXXFeatures_long_long_FOUND)
endif ()
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Borland")
- list(APPEND _expected_features
- CXXFeatures_long_long_FOUND)
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.60)
+ list(APPEND _expected_features
+ CXXFeatures_long_long_FOUND)
+ endif ()
elseif (CMAKE_CXX_COMPILER_ID MATCHES "XL")
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.1)
set(_expected_cxx11_flag "-qlanglvl=extended0x")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=214099fd38f6c5ab6bf68591cce39f78956a121b
commit 214099fd38f6c5ab6bf68591cce39f78956a121b
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Aug 5 22:16:28 2013 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Aug 5 22:16:28 2013 +0200
CXXFeatures: show full outputs for unknown compilers
diff --git a/Tests/Module/CXXFeatures/CMakeLists.txt b/Tests/Module/CXXFeatures/CMakeLists.txt
index 466d308..c52c7ff 100644
--- a/Tests/Module/CXXFeatures/CMakeLists.txt
+++ b/Tests/Module/CXXFeatures/CMakeLists.txt
@@ -1,8 +1,6 @@
cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR)
project(CxxFeatures CXX)
-find_package(CXXFeatures)
-
set(_all_cxx_features
CXXFeatures_auto_FOUND
CXXFeatures_class_override_final_FOUND
@@ -112,10 +110,13 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "XL")
CXXFeatures_rvalue_references_FOUND)
endif ()
else ()
+ message(STATUS "CTEST_FULL_OUTPUT")
message(WARNING "Your C++ compiler configuration is not in the list of known configurations")
set(_compiler_unknown_features TRUE)
endif ()
+find_package(CXXFeatures)
+
foreach (flag IN LISTS _all_cxx_features)
list(FIND _expected_features "${flag}" _flag_index)
if (${flag})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3adf4da6f81990292efea05a2c81454c3cdf7725
commit 3adf4da6f81990292efea05a2c81454c3cdf7725
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Aug 5 22:14:38 2013 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Aug 5 22:14:38 2013 +0200
CXXFeatures: 2 more add expected features for XL
diff --git a/Tests/Module/CXXFeatures/CMakeLists.txt b/Tests/Module/CXXFeatures/CMakeLists.txt
index 744669a..466d308 100644
--- a/Tests/Module/CXXFeatures/CMakeLists.txt
+++ b/Tests/Module/CXXFeatures/CMakeLists.txt
@@ -95,10 +95,14 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "XL")
CXXFeatures_long_long_FOUND)
endif ()
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.1)
+ # func_identifier and sizeof_member are here because they were detected on a
+ # test machine but it is unclear since when they are supported
list(APPEND _expected_features
CXXFeatures_auto_FOUND
CXXFeatures_decltype_FOUND
CXXFeatures_delegating_constructors_FOUND
+ CXXFeatures_func_identifier_FOUND
+ CXXFeatures_sizeof_member_FOUND
CXXFeatures_static_assert_FOUND
CXXFeatures_variadic_templates_FOUND)
endif ()
-----------------------------------------------------------------------
Summary of changes:
Tests/Module/CXXFeatures/CMakeLists.txt | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list