diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-23 15:36:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-08-23 15:36:35 (GMT) |
| commit | 6fd0c721158b51690ca9e7e9d34b82ef7e0f03ff (patch) | |
| tree | fa3e273774b81e5345657be0f5033263086cd484 | |
| parent | 02645aa6aec748a1f3ea24715b3bd03465ae4835 (diff) | |
| parent | de9840d1b89481132ee128715506f6aee9d0277c (diff) | |
| download | CMake-6fd0c721158b51690ca9e7e9d34b82ef7e0f03ff.zip CMake-6fd0c721158b51690ca9e7e9d34b82ef7e0f03ff.tar.gz CMake-6fd0c721158b51690ca9e7e9d34b82ef7e0f03ff.tar.bz2 | |
Merge branch 'ninja-cl-intl' into release-3.9
Merge-request: !1179
| -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 eeb806f..7588f63 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/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) |