Commit 8ec60c67 authored by Stephen Kelly's avatar Stephen Kelly Committed by Brad King
Browse files

cmGlobalGenerator: Create GeneratorTargets with a local generator.

parent dee197fe
...@@ -1456,9 +1456,10 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo() ...@@ -1456,9 +1456,10 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGlobalGenerator::CreateGeneratorTargets(cmMakefile *mf) void cmGlobalGenerator::CreateGeneratorTargets(cmLocalGenerator *lg)
{ {
cmGeneratorTargetsType generatorTargets; cmGeneratorTargetsType generatorTargets;
cmMakefile* mf = lg->GetMakefile();
cmTargets& targets = mf->GetTargets(); cmTargets& targets = mf->GetTargets();
for(cmTargets::iterator ti = targets.begin(); for(cmTargets::iterator ti = targets.begin();
ti != targets.end(); ++ti) ti != targets.end(); ++ti)
...@@ -1487,7 +1488,7 @@ void cmGlobalGenerator::CreateGeneratorTargets() ...@@ -1487,7 +1488,7 @@ void cmGlobalGenerator::CreateGeneratorTargets()
// Construct per-target generator information. // Construct per-target generator information.
for(unsigned int i=0; i < this->LocalGenerators.size(); ++i) for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
{ {
this->CreateGeneratorTargets(this->LocalGenerators[i]->GetMakefile()); this->CreateGeneratorTargets(this->LocalGenerators[i]);
} }
} }
......
...@@ -483,7 +483,7 @@ private: ...@@ -483,7 +483,7 @@ private:
// Per-target generator information. // Per-target generator information.
cmGeneratorTargetsType GeneratorTargets; cmGeneratorTargetsType GeneratorTargets;
friend class cmake; friend class cmake;
void CreateGeneratorTargets(cmMakefile* mf); void CreateGeneratorTargets(cmLocalGenerator* lg);
void CreateGeneratorTargets(); void CreateGeneratorTargets();
void ClearGeneratorMembers(); void ClearGeneratorMembers();
......
...@@ -483,7 +483,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args) ...@@ -483,7 +483,7 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
std::string linkPath; std::string linkPath;
std::string flags; std::string flags;
std::string linkFlags; std::string linkFlags;
gg->CreateGeneratorTargets(mf); gg->CreateGeneratorTargets(lg.get());
cmGeneratorTarget *gtgt = gg->GetGeneratorTarget(tgt); cmGeneratorTarget *gtgt = gg->GetGeneratorTarget(tgt);
lg->GetTargetFlags(linkLibs, frameworkPath, linkPath, flags, linkFlags, lg->GetTargetFlags(linkLibs, frameworkPath, linkPath, flags, linkFlags,
gtgt, false); gtgt, false);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment