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

cmGeneratorTarget: Don't store ObjectSources for object libraries. 

Compute them on demand instead.
This commit is contained in:
Stephen Kelly 2014-03-14 11:02:47 +01:00
parent f6da044080
commit c481fadc07
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmGeneratorTarget.cxx
View File

@ -310,10 +310,6 @@ cmGeneratorTarget
::GetObjectSources(std::vector<cmSourceFile const*> &data) const ::GetObjectSources(std::vector<cmSourceFile const*> &data) const
{ {
IMPLEMENT_VISIT(ObjectSources); IMPLEMENT_VISIT(ObjectSources);
if (this->Target->GetType() == cmTarget::OBJECT_LIBRARY)
{
this->ObjectSources = data;
}
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -577,9 +573,11 @@ cmGeneratorTarget::UseObjectLibraries(std::vector<std::string>& objs) const
cmTarget* objLib = *ti; cmTarget* objLib = *ti;
cmGeneratorTarget* ogt = cmGeneratorTarget* ogt =
this->GlobalGenerator->GetGeneratorTarget(objLib); this->GlobalGenerator->GetGeneratorTarget(objLib);
std::vector<cmSourceFile const*> objectSources;
ogt->GetObjectSources(objectSources);
for(std::vector<cmSourceFile const*>::const_iterator for(std::vector<cmSourceFile const*>::const_iterator
si = ogt->ObjectSources.begin(); si = objectSources.begin();
si != ogt->ObjectSources.end(); ++si) si != objectSources.end(); ++si)
{ {
std::string obj = ogt->ObjectDirectory; std::string obj = ogt->ObjectDirectory;
obj += ogt->Objects[*si]; obj += ogt->Objects[*si];

1
Source/cmGeneratorTarget.h
View File

@ -127,7 +127,6 @@ private:
std::map<cmSourceFile const*, std::string> Objects; std::map<cmSourceFile const*, std::string> Objects;
std::set<cmSourceFile const*> ExplicitObjectName; std::set<cmSourceFile const*> ExplicitObjectName;
mutable std::vector<cmSourceFile const*> ObjectSources;
std::vector<cmTarget*> ObjectLibraries; std::vector<cmTarget*> ObjectLibraries;
mutable std::map<std::string, std::vector<std::string> > SystemIncludesCache; mutable std::map<std::string, std::vector<std::string> > SystemIncludesCache;