diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-10 16:24:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-10 16:24:39 (GMT) |
| commit | f23aa1c1202b55121a2c90aaab97aeee28a8eec6 (patch) | |
| tree | 019c081e29868c86384333722cbb730fafaecb29 /Source/cmGlobalNinjaGenerator.h | |
| parent | fb40808b76a72a1783a2d179fde4b60da8a4a3d5 (diff) | |
| parent | 9af6e2e7b2940d5ba4d138f0df5950a675ec41c0 (diff) | |
| download | CMake-f23aa1c1202b55121a2c90aaab97aeee28a8eec6.zip CMake-f23aa1c1202b55121a2c90aaab97aeee28a8eec6.tar.gz CMake-f23aa1c1202b55121a2c90aaab97aeee28a8eec6.tar.bz2 | |
Merge topic 'ninja-utf8'
9af6e2e7b2 Ninja: Use new wincodepage tool to determine encoding
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5860
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.h')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index 0c919ef..9f31708 100644 --- a/Source/cmGlobalNinjaGenerator.h +++ b/Source/cmGlobalNinjaGenerator.h @@ -388,6 +388,7 @@ public: { return "1.10.2"; } + static std::string RequiredNinjaVersionForCodePage() { return "1.11"; } bool SupportsConsolePool() const; bool SupportsImplicitOuts() const; bool SupportsManifestRestat() const; @@ -474,6 +475,7 @@ private: std::string GetEditCacheCommand() const override; bool FindMakeProgram(cmMakefile* mf) override; void CheckNinjaFeatures(); + void CheckNinjaCodePage(); bool CheckLanguages(std::vector<std::string> const& languages, cmMakefile* mf) const override; bool CheckFortran(cmMakefile* mf) const; @@ -568,6 +570,9 @@ private: bool NinjaSupportsUnconditionalRecompactTool = false; bool NinjaSupportsMultipleOutputs = false; bool NinjaSupportsMetadataOnRegeneration = false; + bool NinjaSupportsCodePage = false; + + codecvt::Encoding NinjaExpectedEncoding = codecvt::None; bool DiagnosedCxxModuleSupport = false; |