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

cmGlobalGenerator: Port IsRootOnlyTarget to cmGeneratorTarget.

This commit is contained in:
Stephen Kelly 2015-10-19 00:41:14 +02:00
parent 83703bda7d
commit 1df8bd3ab0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGlobalGenerator.cxx
View File

@ -2704,13 +2704,13 @@ void cmGlobalGenerator::GetTargetSets(TargetDependSet& projectTargets,
for (cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l) for (cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
{ {
cmTarget* target = &l->second; cmTarget* target = &l->second;
if(this->IsRootOnlyTarget(target) && cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
if(this->IsRootOnlyTarget(gt) &&
target->GetMakefile() != root->GetMakefile()) target->GetMakefile() != root->GetMakefile())
{ {
continue; continue;
} }
// put the target in the set of original targets // put the target in the set of original targets
cmGeneratorTarget* gt = this->GetGeneratorTarget(target);
originalTargets.insert(gt); originalTargets.insert(gt);
// Get the set of targets that depend on target // Get the set of targets that depend on target
this->AddTargetDepends(gt, projectTargets); this->AddTargetDepends(gt, projectTargets);
@ -2719,7 +2719,7 @@ void cmGlobalGenerator::GetTargetSets(TargetDependSet& projectTargets,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool cmGlobalGenerator::IsRootOnlyTarget(cmTarget* target) const bool cmGlobalGenerator::IsRootOnlyTarget(cmGeneratorTarget* target) const
{ {
return (target->GetType() == cmState::GLOBAL_TARGET || return (target->GetType() == cmState::GLOBAL_TARGET ||
target->GetName() == this->GetAllTargetName()); target->GetName() == this->GetAllTargetName());

2
Source/cmGlobalGenerator.h
View File

@ -376,7 +376,7 @@ protected:
void GetTargetSets(TargetDependSet& projectTargets, void GetTargetSets(TargetDependSet& projectTargets,
TargetDependSet& originalTargets, TargetDependSet& originalTargets,
cmLocalGenerator* root, GeneratorVector const&); cmLocalGenerator* root, GeneratorVector const&);
bool IsRootOnlyTarget(cmTarget* target) const; bool IsRootOnlyTarget(cmGeneratorTarget* target) const;
void AddTargetDepends(const cmGeneratorTarget* target, void AddTargetDepends(const cmGeneratorTarget* target,
TargetDependSet& projectTargets); TargetDependSet& projectTargets);
void SetLanguageEnabledFlag(const std::string& l, cmMakefile* mf); void SetLanguageEnabledFlag(const std::string& l, cmMakefile* mf);