浏览代码

C++ feature checks: Prepare for multiple check output filters

Brad King 8 年之前
父节点
当前提交
eb3abf8b2b
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      Source/Checks/cm_cxx_features.cmake

+ 2 - 1
Source/Checks/cm_cxx_features.cmake

@@ -14,8 +14,9 @@ function(cm_check_cxx_feature name)
       CMAKE_FLAGS ${maybe_cxx_standard}
       CMAKE_FLAGS ${maybe_cxx_standard}
       OUTPUT_VARIABLE OUTPUT
       OUTPUT_VARIABLE OUTPUT
       )
       )
+    set(check_output "${OUTPUT}")
     # Filter out MSBuild output that looks like a warning.
     # Filter out MSBuild output that looks like a warning.
-    string(REGEX REPLACE " +0 Warning\\(s\\)" "" check_output "${OUTPUT}")
+    string(REGEX REPLACE " +0 Warning\\(s\\)" "" check_output "${check_output}")
     # If using the feature causes warnings, treat it as broken/unavailable.
     # If using the feature causes warnings, treat it as broken/unavailable.
     if(check_output MATCHES "[Ww]arning")
     if(check_output MATCHES "[Ww]arning")
       set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE)
       set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE)