diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-29 13:01:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-29 13:01:45 (GMT) |
| commit | 50c438b23e4155d1fe756a0041452e801f683171 (patch) | |
| tree | ffefd864858808e711c5ee14b7c9519200439a8d | |
| parent | 25b63e06a174a2037958515cba167a0e0a926612 (diff) | |
| parent | 5058fb5401d1b07f4074bd6f1e4281008bf1b65f (diff) | |
| download | CMake-50c438b23e4155d1fe756a0041452e801f683171.zip CMake-50c438b23e4155d1fe756a0041452e801f683171.tar.gz CMake-50c438b23e4155d1fe756a0041452e801f683171.tar.bz2 | |
Merge topic 'msbuild-utf8-disable'
5058fb5401 VS: Drop StdOutEncoding with VS 16.6 pending investigation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4820
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index de88182..8cb933b 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -4951,7 +4951,10 @@ std::string cmVisualStudio10TargetGenerator::GetCMakeFilePath( return path; } -void cmVisualStudio10TargetGenerator::WriteStdOutEncodingUtf8(Elem& e1) +void cmVisualStudio10TargetGenerator::WriteStdOutEncodingUtf8(Elem& /* e1 */) { - e1.Element("StdOutEncoding", "UTF-8"); + // FIXME: As of VS 16.6.0, this breaks custom commands with symbolic outputs. + // See https://gitlab.kitware.com/cmake/cmake/-/issues/20769 for details. + // Disable it for now. + // e1.Element("StdOutEncoding", "UTF-8"); } |