|
@@ -1141,9 +1141,7 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
|
|
|
cmNinjaVars variables;
|
|
cmNinjaVars variables;
|
|
|
// Use 'console' pool to get non buffered output of the CMake re-run call
|
|
// Use 'console' pool to get non buffered output of the CMake re-run call
|
|
|
// Available since Ninja 1.5
|
|
// Available since Ninja 1.5
|
|
|
- if(cmSystemTools::VersionCompare(cmSystemTools::OP_LESS,
|
|
|
|
|
- ninjaVersion().c_str(),
|
|
|
|
|
- "1.5") == false)
|
|
|
|
|
|
|
+ if(SupportsConsolePool())
|
|
|
{
|
|
{
|
|
|
variables["pool"] = "console";
|
|
variables["pool"] = "console";
|
|
|
}
|
|
}
|
|
@@ -1185,6 +1183,12 @@ std::string cmGlobalNinjaGenerator::ninjaVersion() const
|
|
|
return version;
|
|
return version;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+bool cmGlobalNinjaGenerator::SupportsConsolePool() const
|
|
|
|
|
+{
|
|
|
|
|
+ return cmSystemTools::VersionCompare(cmSystemTools::OP_LESS,
|
|
|
|
|
+ ninjaVersion().c_str(), "1.5") == false;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
void cmGlobalNinjaGenerator::WriteTargetClean(std::ostream& os)
|
|
void cmGlobalNinjaGenerator::WriteTargetClean(std::ostream& os)
|
|
|
{
|
|
{
|
|
|
WriteRule(*this->RulesFileStream,
|
|
WriteRule(*this->RulesFileStream,
|