diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-06 12:59:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-06 12:59:55 (GMT) |
| commit | 56136e6315aa0c2a3e1a11f9c795c180f1cf6a9e (patch) | |
| tree | 1ad8ade8508175a3fe9a3bb48571590b043761f5 | |
| parent | 344f9ed96a4cc457810ca84cf6549f7a4218fd8a (diff) | |
| parent | f4ce396254eff94446df92f9900dc501fad65ad8 (diff) | |
| download | CMake-56136e6315aa0c2a3e1a11f9c795c180f1cf6a9e.zip CMake-56136e6315aa0c2a3e1a11f9c795c180f1cf6a9e.tar.gz CMake-56136e6315aa0c2a3e1a11f9c795c180f1cf6a9e.tar.bz2 | |
Merge branch 'fix-vs2017-featuredetect' into release-3.9
| -rw-r--r-- | Source/Checks/cm_cxx_features.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake index c3835c3..c9a19af 100644 --- a/Source/Checks/cm_cxx_features.cmake +++ b/Source/Checks/cm_cxx_features.cmake @@ -15,7 +15,7 @@ function(cm_check_cxx_feature name) OUTPUT_VARIABLE OUTPUT ) # If using the feature causes warnings, treat it as broken/unavailable. - if(OUTPUT MATCHES "[Ww]arning") + if(OUTPUT MATCHES "[Ww]arning" AND NOT OUTPUT MATCHES "0 Warning") set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE) endif() if(CMake_HAVE_CXX_${FEATURE}) |