diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-16 17:19:48 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-16 18:15:03 (GMT) |
| commit | 8aaed08696a7444b80b6319e2b5af320ee589658 (patch) | |
| tree | c3a240ee0c329f4602ce17ab9a9ae53cddc29dca | |
| parent | 393654bf49f2c8d86e9ec88fc3c8322497432aea (diff) | |
| download | CMake-8aaed08696a7444b80b6319e2b5af320ee589658.zip CMake-8aaed08696a7444b80b6319e2b5af320ee589658.tar.gz CMake-8aaed08696a7444b80b6319e2b5af320ee589658.tar.bz2 | |
cmGeneratorTarget: Port object library handling to cmGeneratorTarget.
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 6f91d1a..466d3c2 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -2004,27 +2004,26 @@ cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs, { std::vector<cmSourceFile const*> objectFiles; this->GetExternalObjects(objectFiles, config); - std::vector<cmTarget*> objectLibraries; + std::vector<cmGeneratorTarget*> objectLibraries; for(std::vector<cmSourceFile const*>::const_iterator it = objectFiles.begin(); it != objectFiles.end(); ++it) { std::string objLib = (*it)->GetObjectLibrary(); - if (cmTarget* tgt = this->Makefile->FindTargetToUse(objLib)) + if (cmGeneratorTarget* tgt = + this->LocalGenerator->FindGeneratorTargetToUse(objLib)) { objectLibraries.push_back(tgt); } } - std::vector<cmTarget*>::const_iterator end + std::vector<cmGeneratorTarget*>::const_iterator end = cmRemoveDuplicates(objectLibraries); - for(std::vector<cmTarget*>::const_iterator + for(std::vector<cmGeneratorTarget*>::const_iterator ti = objectLibraries.begin(); ti != end; ++ti) { - cmTarget* objLib = *ti; - cmGeneratorTarget* ogt = - this->GlobalGenerator->GetGeneratorTarget(objLib); + cmGeneratorTarget* ogt = *ti; std::vector<cmSourceFile const*> objectSources; ogt->GetObjectSources(objectSources, config); for(std::vector<cmSourceFile const*>::const_iterator |