diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-07 13:59:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-07 13:59:12 (GMT) |
| commit | 5b1d0aeffe337e8109d267d88f7533807fb76c31 (patch) | |
| tree | d11d2b57bc20b45ff4cbfb60ec8bb5e0fc131db1 | |
| parent | 1ee7a4ec77fe9d3be8160de19ded53e3afe9ce95 (diff) | |
| parent | f4ce396254eff94446df92f9900dc501fad65ad8 (diff) | |
| download | CMake-5b1d0aeffe337e8109d267d88f7533807fb76c31.zip CMake-5b1d0aeffe337e8109d267d88f7533807fb76c31.tar.gz CMake-5b1d0aeffe337e8109d267d88f7533807fb76c31.tar.bz2 | |
Merge topic 'fix-vs2017-featuredetect'
f4ce3962 C++ feature checks: Do not match "0 Warning(s)" as a warning
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !930
| -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}) |