diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-29 00:05:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-10-30 12:29:55 (GMT) |
| commit | 2e5af30ce0181b6652fb6f3a90d2292b065dee8d (patch) | |
| tree | ba16e19f6925460023b68ce97d6949684b083067 /Modules | |
| parent | e1c16791481f1741d65cb98878d8171307422513 (diff) | |
| download | CMake-2e5af30ce0181b6652fb6f3a90d2292b065dee8d.zip CMake-2e5af30ce0181b6652fb6f3a90d2292b065dee8d.tar.gz CMake-2e5af30ce0181b6652fb6f3a90d2292b065dee8d.tar.bz2 | |
Ninja: Match showIncludes dependencies using console output code page
Generalize the fix from commit 37a279f8d1 (Ninja: Write msvc_deps_prefix
as UTF-8 when console codepage is UTF-8, 2020-07-31, v3.19.0-rc1~349^2).
`cl /showIncludes` output is encoded using the console output code page,
so this is the byte sequence that Ninja must use to match its lines.
Fixes: #24068
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 6b58549..73c775a 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -1127,7 +1127,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 + ENCODING AUTO # cl prints in console output code page ) if(res EQUAL 0 AND "${out}" MATCHES "(^|\n)([^:\n]*:[^:\n]*:[ \t]*)") set(CMAKE_${lang}_CL_SHOWINCLUDES_PREFIX "${CMAKE_MATCH_2}" PARENT_SCOPE) |