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

cmLocalGenerator: Store imported targets in a separate container.

Browse Source
This commit is contained in:
Stephen Kelly 2015-10-25 12:56:31 +01:00
parent def6da616b
commit 9b244cc0ec
3 changed files with 8 additions and 0 deletions

1
Source/cmGlobalGenerator.cxx

@ -1606,6 +1606,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
{ {
cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg); cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
this->GeneratorTargets[*j] = gt; this->GeneratorTargets[*j] = gt;
lg->AddImportedGeneratorTarget(gt);
} }
} }

5
Source/cmLocalGenerator.cxx

@ -455,6 +455,11 @@ void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
this->GeneratorTargets.push_back(gt); this->GeneratorTargets.push_back(gt);
} }
void cmLocalGenerator::AddImportedGeneratorTarget(cmGeneratorTarget* gt)
{
this->ImportedGeneratorTargets.push_back(gt);
}
struct NamedGeneratorTargetFinder struct NamedGeneratorTargetFinder
{ {
NamedGeneratorTargetFinder(std::string const& name) NamedGeneratorTargetFinder(std::string const& name)

2
Source/cmLocalGenerator.h

@ -121,6 +121,7 @@ public:
} }
void AddGeneratorTarget(cmGeneratorTarget* gt); void AddGeneratorTarget(cmGeneratorTarget* gt);
void AddImportedGeneratorTarget(cmGeneratorTarget* gt);
cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const; cmGeneratorTarget* FindGeneratorTarget(const std::string& name) const;
cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const; cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;
@ -373,6 +374,7 @@ protected:
std::set<cmGeneratorTarget const*> WarnCMP0063; std::set<cmGeneratorTarget const*> WarnCMP0063;
std::vector<cmGeneratorTarget*> GeneratorTargets; std::vector<cmGeneratorTarget*> GeneratorTargets;
std::vector<cmGeneratorTarget*> ImportedGeneratorTargets;
std::map<std::string, std::string> AliasTargets; std::map<std::string, std::string> AliasTargets;
bool EmitUniversalBinaryFlags; bool EmitUniversalBinaryFlags;