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

cmTarget: Pre-indent a block in ComputeLinkImplementation

Browse Source 
Prepare to move it into another block without extra whitespace changes.
This commit is contained in:
Brad King 2014-06-19 13:45:15 -04:00
parent f48d8bd6f6
commit 7812d2a912
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Source/cmTarget.cxx
View File

@ -6607,54 +6607,54 @@ void cmTarget::ComputeLinkImplementation(const std::string& config,
cge->GetMaxLanguageStandard(this, this->MaxLanguageStandards); cge->GetMaxLanguageStandard(this, this->MaxLanguageStandards);
} }
for(std::vector<std::string>::const_iterator li = llibs.begin(); for(std::vector<std::string>::const_iterator li = llibs.begin();
li != llibs.end(); ++li) li != llibs.end(); ++li)
{
// Skip entries that resolve to the target itself or are empty.
std::string name = this->CheckCMP0004(*li);
if(name == this->GetName() || name.empty())
{ {
if(name == this->GetName()) // Skip entries that resolve to the target itself or are empty.
std::string name = this->CheckCMP0004(*li);
if(name == this->GetName() || name.empty())
{ {
bool noMessage = false; if(name == this->GetName())
cmake::MessageType messageType = cmake::FATAL_ERROR;
cmOStringStream e;
switch(this->GetPolicyStatusCMP0038())
{ {
case cmPolicies::WARN: bool noMessage = false;
cmake::MessageType messageType = cmake::FATAL_ERROR;
cmOStringStream e;
switch(this->GetPolicyStatusCMP0038())
{ {
e << (this->Makefile->GetPolicies() case cmPolicies::WARN:
->GetPolicyWarning(cmPolicies::CMP0038)) << "\n"; {
messageType = cmake::AUTHOR_WARNING; e << (this->Makefile->GetPolicies()
->GetPolicyWarning(cmPolicies::CMP0038)) << "\n";
messageType = cmake::AUTHOR_WARNING;
}
break;
case cmPolicies::OLD:
noMessage = true;
case cmPolicies::REQUIRED_IF_USED:
case cmPolicies::REQUIRED_ALWAYS:
case cmPolicies::NEW:
// Issue the fatal message.
break;
} }
break;
case cmPolicies::OLD:
noMessage = true;
case cmPolicies::REQUIRED_IF_USED:
case cmPolicies::REQUIRED_ALWAYS:
case cmPolicies::NEW:
// Issue the fatal message.
break;
}
if(!noMessage) if(!noMessage)
{
e << "Target \"" << this->GetName() << "\" links to itself.";
this->Makefile->GetCMakeInstance()->IssueMessage(
messageType, e.str(), this->GetBacktrace());
if (messageType == cmake::FATAL_ERROR)
{ {
return; e << "Target \"" << this->GetName() << "\" links to itself.";
this->Makefile->GetCMakeInstance()->IssueMessage(
messageType, e.str(), this->GetBacktrace());
if (messageType == cmake::FATAL_ERROR)
{
return;
}
} }
} }
continue;
} }
continue;
}
// The entry is meant for this configuration. // The entry is meant for this configuration.
impl.Libraries.push_back( impl.Libraries.push_back(
cmLinkItem(name, this->FindTargetToLink(name))); cmLinkItem(name, this->FindTargetToLink(name)));
} }
cmTarget::LinkLibraryType linkType = this->ComputeLinkType(config); cmTarget::LinkLibraryType linkType = this->ComputeLinkType(config);
LinkLibraryVectorType const& oldllibs = this->GetOriginalLinkLibraries(); LinkLibraryVectorType const& oldllibs = this->GetOriginalLinkLibraries();