diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-15 15:42:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-12-15 15:42:43 (GMT) |
| commit | 76fa3b383e037f69089f0b193708456d3f47c8ed (patch) | |
| tree | 4e3b67ddc4be99178a361b3ae7ea6880100d9ef7 | |
| parent | 6fb568cef6c8eebe1730c51bee7f4f92ce805c39 (diff) | |
| parent | 907bc3543727767b72e3d9085dbb3c02b1a717ae (diff) | |
| download | CMake-76fa3b383e037f69089f0b193708456d3f47c8ed.zip CMake-76fa3b383e037f69089f0b193708456d3f47c8ed.tar.gz CMake-76fa3b383e037f69089f0b193708456d3f47c8ed.tar.bz2 | |
Merge topic 'vs-vcxproj-lowercase-utf-8'
907bc354 VS: Emit "utf-8" encoding as lowercase in .vcxproj headers
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1594
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 5 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 8c9e461..4c4c62c 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -951,6 +951,11 @@ void cmGlobalVisualStudio10Generator::PathTooLong(cmGeneratorTarget* target, } } +std::string cmGlobalVisualStudio10Generator::Encoding() +{ + return "utf-8"; +} + bool cmGlobalVisualStudio10Generator::IsNsightTegra() const { return !this->NsightTegraVersion.empty(); diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h index 5f80c73..fc21193 100644 --- a/Source/cmGlobalVisualStudio10Generator.h +++ b/Source/cmGlobalVisualStudio10Generator.h @@ -96,6 +96,7 @@ public: void PathTooLong(cmGeneratorTarget* target, cmSourceFile const* sf, std::string const& sfRel); + std::string Encoding() override; virtual const char* GetToolsVersion() { return "4.0"; } bool FindMakeProgram(cmMakefile* mf) override; |