kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ninja: Pre-compute "all" build target name

This commit is contained in:
Nicolas Despres 2016-05-13 23:42:02 +02:00 committed by Brad King
parent 5ca72750c8
commit 3b3ecdfa48
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGlobalNinjaGenerator.cxx
View File

@ -488,6 +488,8 @@ void cmGlobalNinjaGenerator::Generate()
this->OpenBuildFileStream(); this->OpenBuildFileStream();
this->OpenRulesFileStream(); this->OpenRulesFileStream();
this->TargetAll = "all";
this->PolicyCMP0058 = this->PolicyCMP0058 =
this->LocalGenerators[0]->GetMakefile()->GetPolicyStatus( this->LocalGenerators[0]->GetMakefile()->GetPolicyStatus(
cmPolicies::CMP0058); cmPolicies::CMP0058);
@ -1059,7 +1061,7 @@ void cmGlobalNinjaGenerator::WriteUnknownExplicitDependencies(std::ostream& os)
// should all match now. // should all match now.
std::vector<std::string> unknownExplicitDepends; std::vector<std::string> unknownExplicitDepends;
this->CombinedCustomCommandExplicitDependencies.erase("all"); this->CombinedCustomCommandExplicitDependencies.erase(this->TargetAll);
std::set_difference(this->CombinedCustomCommandExplicitDependencies.begin(), std::set_difference(this->CombinedCustomCommandExplicitDependencies.begin(),
this->CombinedCustomCommandExplicitDependencies.end(), this->CombinedCustomCommandExplicitDependencies.end(),
@ -1125,7 +1127,7 @@ void cmGlobalNinjaGenerator::WriteBuiltinTargets(std::ostream& os)
void cmGlobalNinjaGenerator::WriteTargetAll(std::ostream& os) void cmGlobalNinjaGenerator::WriteTargetAll(std::ostream& os)
{ {
cmNinjaDeps outputs; cmNinjaDeps outputs;
outputs.push_back("all"); outputs.push_back(this->TargetAll);
this->WritePhonyBuild(os, "The main all target.", outputs, this->WritePhonyBuild(os, "The main all target.", outputs,
this->AllDependencies); this->AllDependencies);

3
Source/cmGlobalNinjaGenerator.h
View File

@ -397,6 +397,9 @@ private:
std::string NinjaCommand; std::string NinjaCommand;
std::string NinjaVersion; std::string NinjaVersion;
private:
std::string TargetAll;
}; };
#endif // ! cmGlobalNinjaGenerator_h #endif // ! cmGlobalNinjaGenerator_h