[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-525-g41a5113
Daniel Pfeifer
daniel at pfeifer-mail.de
Fri Jun 24 02:01:03 EDT 2016
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 41a51131f9a253459577cbe4562be5dd368a517d (commit)
via 8fd49ae83957bf1504a94a5ed2c8ccf89dbc5f09 (commit)
from 272f159ea60d27ff817bd32335a8edcf2a994fcd (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41a51131f9a253459577cbe4562be5dd368a517d
commit 41a51131f9a253459577cbe4562be5dd368a517d
Merge: 272f159 8fd49ae
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Jun 24 02:00:52 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 24 02:00:52 2016 -0400
Merge topic 'compiler-features' into next
8fd49ae8 fixup! Make C++ feature checks extensible
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8fd49ae83957bf1504a94a5ed2c8ccf89dbc5f09
commit 8fd49ae83957bf1504a94a5ed2c8ccf89dbc5f09
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Fri Jun 24 07:58:35 2016 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Fri Jun 24 07:59:31 2016 +0200
fixup! Make C++ feature checks extensible
diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake
index 20a9348..18dbaf8 100644
--- a/Source/Checks/cm_cxx_features.cmake
+++ b/Source/Checks/cm_cxx_features.cmake
@@ -9,6 +9,10 @@ function(cm_check_cxx_feature name)
CMAKE_FLAGS -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
OUTPUT_VARIABLE OUTPUT
)
+ # If using the feature causes warnings, treat it as broken/unavailable.
+ if(OUTPUT MATCHES "warning")
+ set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE)
+ endif()
if(CMake_HAVE_CXX_${FEATURE})
message(STATUS "Checking if compiler supports C++ ${name} - yes")
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-----------------------------------------------------------------------
Summary of changes:
Source/Checks/cm_cxx_features.cmake | 4 ++++
1 file changed, 4 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list