diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-24 13:34:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-24 13:35:01 (GMT) |
| commit | 229c37a54b40cdf6b9dde543f11603fceab19da6 (patch) | |
| tree | 0f32461018e77a39e06abbd37b354aee6deab739 /Modules | |
| parent | 797196c8a7d1a21d1551357f244daa23cf7c918f (diff) | |
| parent | de9840d1b89481132ee128715506f6aee9d0277c (diff) | |
| download | CMake-229c37a54b40cdf6b9dde543f11603fceab19da6.zip CMake-229c37a54b40cdf6b9dde543f11603fceab19da6.tar.gz CMake-229c37a54b40cdf6b9dde543f11603fceab19da6.tar.bz2 | |
Merge topic 'ninja-cl-intl'
de9840d1 Ninja: Fix support for MSVC with non-English output
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1179
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 8d4e6aa..f11059f 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/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) |