瀏覽代碼

Merge topic 'ninja-cl-intl'

de9840d1 Ninja: Fix support for MSVC with non-English output

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1179
Brad King 8 年之前
父節點
當前提交
229c37a54b
共有 1 個文件被更改,包括 1 次插入0 次删除
  1. 1 0
      Modules/CMakeDetermineCompilerId.cmake

+ 1 - 0
Modules/CMakeDetermineCompilerId.cmake

@@ -710,6 +710,7 @@ function(CMAKE_DETERMINE_MSVC_SHOWINCLUDES_PREFIX lang userflags)
     OUTPUT_VARIABLE out
     ERROR_VARIABLE err
     RESULT_VARIABLE res
+    ENCODING AUTO # cl prints in current code page
     )
   if(res EQUAL 0 AND "${out}" MATCHES "(^|\n)([^:\n]*:[^:\n]*:[ \t]*)")
     set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "${CMAKE_MATCH_2}" PARENT_SCOPE)