Browse Source

Merge branch 'ninja-cl-intl' into release-3.9

Merge-request: !1179
Brad King 8 years ago
parent
commit
6fd0c72115
1 changed files with 1 additions and 0 deletions
  1. 1 0
      Modules/CMakeDetermineCompilerId.cmake

+ 1 - 0
Modules/CMakeDetermineCompilerId.cmake

@@ -706,6 +706,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)