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

cmTarget: Simplify processILibs implementation

Browse Source 
Combine the outer two if() conditions into a single one with &&.
Scope inner lookup result inside its condition.
This commit is contained in:
Brad King 2014-06-16 11:44:49 -04:00
parent 7b85938973
commit e838e0a977
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmTarget.cxx
View File

@ -6123,15 +6123,13 @@ void processILibs(const std::string& config,
std::string const& name, std::string const& name,
std::vector<cmTarget*>& tgts, std::set<cmTarget*>& emitted) std::vector<cmTarget*>& tgts, std::set<cmTarget*>& emitted)
{ {
if (cmTarget* tgt = headTarget->GetMakefile() cmTarget* tgt = headTarget->GetMakefile()
->FindTargetToUse(name)) ->FindTargetToUse(name);
{ if (tgt && emitted.insert(tgt).second)
if (emitted.insert(tgt).second)
{ {
tgts.push_back(tgt); tgts.push_back(tgt);
cmTarget::LinkInterface const* iface = if(cmTarget::LinkInterface const* iface =
tgt->GetLinkInterfaceLibraries(config, headTarget); tgt->GetLinkInterfaceLibraries(config, headTarget))
if (iface)
{ {
for(std::vector<std::string>::const_iterator for(std::vector<std::string>::const_iterator
it = iface->Libraries.begin(); it = iface->Libraries.begin();
@ -6142,7 +6140,6 @@ void processILibs(const std::string& config,
} }
} }
} }
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmTarget::GetTransitiveTargetClosure(const std::string& config, void cmTarget::GetTransitiveTargetClosure(const std::string& config,