diff options
| author | Amine Najahi <anajahi@mathworks.com> | 2021-04-22 19:26:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-05-05 14:56:49 (GMT) |
| commit | f3f57cc4edd528aaf0b8d8633d5f9990f0d804af (patch) | |
| tree | 3ca9148977b9d0044fc5524e9fd3c1f93adeecad /Source | |
| parent | 186c9bff5342c1e8e73fce9cf361b6de5dda3f28 (diff) | |
| download | CMake-f3f57cc4edd528aaf0b8d8633d5f9990f0d804af.zip CMake-f3f57cc4edd528aaf0b8d8633d5f9990f0d804af.tar.gz CMake-f3f57cc4edd528aaf0b8d8633d5f9990f0d804af.tar.bz2 | |
NMake: Use UTF-8 with BOM if supported by nmake
Fixes: #21792
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratedFileStream.cxx | 5 | ||||
| -rw-r--r-- | Source/cmGlobalNMakeMakefileGenerator.h | 2 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/cm_codecvt.cxx | 1 | ||||
| -rw-r--r-- | Source/cm_codecvt.hxx | 1 |
5 files changed, 10 insertions, 2 deletions
diff --git a/Source/cmGeneratedFileStream.cxx b/Source/cmGeneratedFileStream.cxx index 43f384a..06778b1 100644 --- a/Source/cmGeneratedFileStream.cxx +++ b/Source/cmGeneratedFileStream.cxx @@ -42,6 +42,11 @@ cmGeneratedFileStream::cmGeneratedFileStream(std::string const& name, #else static_cast<void>(encoding); #endif + if (encoding == codecvt::UTF8_WITH_BOM) { + // Write the BOM encoding header into the file + char magic[] = { char(0xEF), char(0xBB), char(0xBF) }; + this->write(magic, 3); + } } cmGeneratedFileStream::~cmGeneratedFileStream() diff --git a/Source/cmGlobalNMakeMakefileGenerator.h b/Source/cmGlobalNMakeMakefileGenerator.h index ed52378..402b89f 100644 --- a/Source/cmGlobalNMakeMakefileGenerator.h +++ b/Source/cmGlobalNMakeMakefileGenerator.h @@ -31,7 +31,7 @@ public: /** Get encoding used by generator for makefile files */ codecvt::Encoding GetMakefileEncoding() const override { - return codecvt::ANSI; + return this->NMakeSupportsUTF8 ? codecvt::UTF8_WITH_BOM : codecvt::ANSI; } /** Get the documentation entry for this generator. */ diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index fa469ed..5b6c58d 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -2058,7 +2058,8 @@ std::string cmMakefileTargetGenerator::CreateResponseFile( // Create the response file. std::string responseFileNameFull = cmStrCat(this->TargetBuildDirectoryFull, '/', name); - cmGeneratedFileStream responseStream(responseFileNameFull); + cmGeneratedFileStream responseStream( + responseFileNameFull, false, this->GlobalGenerator->GetMakefileEncoding()); responseStream.SetCopyIfDifferent(true); responseStream << options << "\n"; diff --git a/Source/cm_codecvt.cxx b/Source/cm_codecvt.cxx index 15f83e0..216d3f0 100644 --- a/Source/cm_codecvt.cxx +++ b/Source/cm_codecvt.cxx @@ -31,6 +31,7 @@ codecvt::codecvt(Encoding e) // We don't know which ANSI encoding to use for other platforms than // Windows so we don't do any conversion there case codecvt::UTF8: + case codecvt::UTF8_WITH_BOM: // Assume internal encoding is UTF-8 case codecvt::None: // No encoding diff --git a/Source/cm_codecvt.hxx b/Source/cm_codecvt.hxx index 1860211..b73204f 100644 --- a/Source/cm_codecvt.hxx +++ b/Source/cm_codecvt.hxx @@ -14,6 +14,7 @@ public: { None, UTF8, + UTF8_WITH_BOM, ANSI }; |