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

cmTarget: Constify GetLinkImplementationClosure results

Browse Source 
Populate a vector of "cmTarget const*" instead of "cmTarget*".
This commit is contained in:
Brad King 2014-06-16 10:09:46 -04:00
parent 9f3ed029ce
commit 47ab3ca641
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmTarget.cxx
View File

@ -177,7 +177,7 @@ public:
CachedLinkInterfaceSourcesEntries; CachedLinkInterfaceSourcesEntries;
mutable std::map<std::string, std::vector<TargetPropertyEntry*> > mutable std::map<std::string, std::vector<TargetPropertyEntry*> >
CachedLinkInterfaceCompileFeaturesEntries; CachedLinkInterfaceCompileFeaturesEntries;
mutable std::map<std::string, std::vector<cmTarget*> > mutable std::map<std::string, std::vector<cmTarget const*> >
CachedLinkImplementationClosure; CachedLinkImplementationClosure;
mutable std::map<std::string, bool> CacheLinkInterfaceIncludeDirectoriesDone; mutable std::map<std::string, bool> CacheLinkInterfaceIncludeDirectoriesDone;
@ -5219,7 +5219,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
assert((impliedByUse ^ explicitlySet) assert((impliedByUse ^ explicitlySet)
|| (!impliedByUse && !explicitlySet)); || (!impliedByUse && !explicitlySet));
std::vector<cmTarget*> const& deps = std::vector<cmTarget const*> const& deps =
tgt->GetLinkImplementationClosure(config); tgt->GetLinkImplementationClosure(config);
if(deps.empty()) if(deps.empty())
@ -5245,7 +5245,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
report += "\" property not set.\n"; report += "\" property not set.\n";
} }
for(std::vector<cmTarget*>::const_iterator li = for(std::vector<cmTarget const*>::const_iterator li =
deps.begin(); deps.begin();
li != deps.end(); ++li) li != deps.end(); ++li)
{ {
@ -5435,7 +5435,7 @@ bool isLinkDependentProperty(cmTarget const* tgt, const std::string &p,
const std::string& interfaceProperty, const std::string& interfaceProperty,
const std::string& config) const std::string& config)
{ {
std::vector<cmTarget*> const& deps = std::vector<cmTarget const*> const& deps =
tgt->GetLinkImplementationClosure(config); tgt->GetLinkImplementationClosure(config);
if(deps.empty()) if(deps.empty())
@ -5443,8 +5443,7 @@ bool isLinkDependentProperty(cmTarget const* tgt, const std::string &p,
return false; return false;
} }
for(std::vector<cmTarget*>::const_iterator li = for(std::vector<cmTarget const*>::const_iterator li = deps.begin();
deps.begin();
li != deps.end(); ++li) li != deps.end(); ++li)
{ {
const char *prop = (*li)->GetProperty(interfaceProperty); const char *prop = (*li)->GetProperty(interfaceProperty);
@ -6151,7 +6150,8 @@ cmTarget::GetImportLinkInterface(const std::string& config,
void processILibs(const std::string& config, void processILibs(const std::string& config,
cmTarget const* headTarget, cmTarget const* headTarget,
std::string const& name, std::string const& name,
std::vector<cmTarget*>& tgts, std::set<cmTarget*>& emitted) std::vector<cmTarget const*>& tgts,
std::set<cmTarget const*>& emitted)
{ {
cmTarget* tgt = headTarget->GetMakefile() cmTarget* tgt = headTarget->GetMakefile()
->FindTargetToUse(name); ->FindTargetToUse(name);
@ -6172,15 +6172,15 @@ void processILibs(const std::string& config,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::vector<cmTarget*> const& std::vector<cmTarget const*> const&
cmTarget::GetLinkImplementationClosure(const std::string& config) const cmTarget::GetLinkImplementationClosure(const std::string& config) const
{ {
std::vector<cmTarget*>& tgts = std::vector<cmTarget const*>& tgts =
this->Internal->CachedLinkImplementationClosure[config]; this->Internal->CachedLinkImplementationClosure[config];
if(!this->Internal->CacheLinkImplementationClosureDone[config]) if(!this->Internal->CacheLinkImplementationClosureDone[config])
{ {
this->Internal->CacheLinkImplementationClosureDone[config] = true; this->Internal->CacheLinkImplementationClosureDone[config] = true;
std::set<cmTarget*> emitted; std::set<cmTarget const*> emitted;
cmTarget::LinkImplementation const* impl cmTarget::LinkImplementation const* impl
= this->GetLinkImplementationLibraries(config); = this->GetLinkImplementationLibraries(config);

2
Source/cmTarget.h
View File

@ -273,7 +273,7 @@ public:
void GetTransitivePropertyTargets(const std::string& config, void GetTransitivePropertyTargets(const std::string& config,
cmTarget const* headTarget, cmTarget const* headTarget,
std::vector<cmTarget const*> &libs) const; std::vector<cmTarget const*> &libs) const;
std::vector<cmTarget*> const& std::vector<cmTarget const*> const&
GetLinkImplementationClosure(const std::string& config) const; GetLinkImplementationClosure(const std::string& config) const;
/** The link implementation specifies the direct library /** The link implementation specifies the direct library