mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmGlobalNinjaGenerator: Rename SupportsConsolePool to SupportsDirectConsole

Browse Source 
Use a name that is not ninja-specific.
This commit is contained in:
NAKAMURA Takumi
2021-06-29 11:27:07 +09:00
committed by Brad King
parent e062d4a2a3
commit 61a737b088
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGlobalNinjaGenerator.cxx
View File

@@ -382,7 +382,7 @@ void cmGlobalNinjaGenerator::WriteCustomCommandBuild(
if (restat) {
vars["restat"] = "1";
}
if (uses_terminal && this->SupportsConsolePool()) {
if (uses_terminal && this->SupportsDirectConsole()) {
vars["pool"] = "console";
} else if (!job_pool.empty()) {
vars["pool"] = job_pool;
@@ -1847,7 +1847,7 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
// Use 'console' pool to get non buffered output of the CMake re-run call
// Available since Ninja 1.5
if (this->SupportsConsolePool()) {
if (this->SupportsDirectConsole()) {
reBuild.Variables["pool"] = "console";
}
@@ -1941,7 +1941,7 @@ std::string cmGlobalNinjaGenerator::NinjaCmd() const
return "ninja";
}
bool cmGlobalNinjaGenerator::SupportsConsolePool() const
bool cmGlobalNinjaGenerator::SupportsDirectConsole() const
{
return this->NinjaSupportsConsolePool;
}

2
Source/cmGlobalNinjaGenerator.h
View File

@@ -406,7 +406,7 @@ public:
return "1.10.2";
}
static std::string RequiredNinjaVersionForCodePage() { return "1.11"; }
bool SupportsConsolePool() const;
bool SupportsDirectConsole() const;
bool SupportsImplicitOuts() const;
bool SupportsManifestRestat() const;
bool SupportsMultilineDepfile() const;

2
Source/cmLocalNinjaGenerator.cxx
View File

@@ -279,7 +279,7 @@ void cmLocalNinjaGenerator::WriteNinjaRequiredVersion(std::ostream& os)
std::string requiredVersion = cmGlobalNinjaGenerator::RequiredNinjaVersion();
// Ninja generator uses the 'console' pool if available (>= 1.5)
if (this->GetGlobalNinjaGenerator()->SupportsConsolePool()) {
if (this->GetGlobalNinjaGenerator()->SupportsDirectConsole()) {
requiredVersion =
cmGlobalNinjaGenerator::RequiredNinjaVersionForConsolePool();
}