浏览代码

Merge topic 'fix-vs2017-featuredetect'

f4ce3962 C++ feature checks: Do not match "0 Warning(s)" as a warning

Acked-by: Kitware Robot <[email protected]>
Merge-request: !930
Brad King 8 年之前
父节点
当前提交
5b1d0aeffe
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      Source/Checks/cm_cxx_features.cmake

+ 1 - 1
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})