From 1db4d7462808e9af5e2a6de029943d51a521f52c Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Tue, 29 Jun 2021 11:27:07 +0900 Subject: cmGlobalCommonGenerator: Add SupportsDirectConsole Default to `true` since this is used by Makefile generators. The Ninja generator already overrides it to use a version check. --- Source/cmGlobalCommonGenerator.h | 3 +++ Source/cmGlobalNinjaGenerator.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/cmGlobalCommonGenerator.h b/Source/cmGlobalCommonGenerator.h index 2aa9d27..21cfd11 100644 --- a/Source/cmGlobalCommonGenerator.h +++ b/Source/cmGlobalCommonGenerator.h @@ -42,4 +42,7 @@ public: std::map ComputeDirectoryTargets() const; bool IsExcludedFromAllInConfig(const DirectoryTarget::Target& t, const std::string& config); + +protected: + virtual bool SupportsDirectConsole() const { return true; } }; diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index 9aa1152..ce47122 100644 --- a/Source/cmGlobalNinjaGenerator.h +++ b/Source/cmGlobalNinjaGenerator.h @@ -406,7 +406,7 @@ public: return "1.10.2"; } static std::string RequiredNinjaVersionForCodePage() { return "1.11"; } - bool SupportsDirectConsole() const; + bool SupportsDirectConsole() const override; bool SupportsImplicitOuts() const; bool SupportsManifestRestat() const; bool SupportsMultilineDepfile() const; -- cgit v0.12