diff options
| author | Brad King <brad.king@kitware.com> | 2022-10-31 13:43:54 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-10-31 09:44:12 -0400 |
| commit | 5b23e3021b969638dd4ef168b362493f818ffe43 (patch) | |
| tree | 491563b34b3aed8bc1b51d173fae93eeffc40f2f /Modules | |
| parent | 17f63457628dd0d13f116d9a1b03c925012220b4 (diff) | |
| parent | a0d4e3bf347a1d995d064de19e14b71b87cbeeda (diff) | |
| download | cmake-5b23e3021b969638dd4ef168b362493f818ffe43.tar.gz | |
Merge topic 'ninja-showIncludes-encoding'
a0d4e3bf34 cmGeneratedFileStream: Drop unused WriteRaw method
2e5af30ce0 Ninja: Match showIncludes dependencies using console output code page
e1c1679148 cm_codecvt: Add support for the Windows console output code page
328c15189d cmGeneratedFileStream: Add support for a temporary alternate encoding
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7845
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 6b5854941f..73c775aeb3 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) |