echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmMakefile: Invert handling of error condition

Browse Source
This commit is contained in:
Stephen Kelly 2016-10-07 20:13:34 +02:00
parent c8ec8d6a7e
commit 4d039c5b46
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmMakefile.cxx
View File

@ -1221,7 +1221,12 @@ void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
cmTargetLinkLibraryType llt) cmTargetLinkLibraryType llt)
{ {
cmTargets::iterator i = this->Targets.find(target); cmTargets::iterator i = this->Targets.find(target);
if (i != this->Targets.end()) { if (i == this->Targets.end()) {
std::ostringstream e;
e << "Attempt to add link library \"" << lib << "\" to target \"" << target
<< "\" which is not built in this directory.";
this->IssueMessage(cmake::FATAL_ERROR, e.str());
} else {
cmTarget* tgt = this->GetGlobalGenerator()->FindTarget(lib); cmTarget* tgt = this->GetGlobalGenerator()->FindTarget(lib);
if (tgt) { if (tgt) {
// if it is not a static or shared library then you can not link to it // if it is not a static or shared library then you can not link to it
@ -1239,11 +1244,6 @@ void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
} }
} }
i->second.AddLinkLibrary(*this, target, lib, llt); i->second.AddLinkLibrary(*this, target, lib, llt);
} else {
std::ostringstream e;
e << "Attempt to add link library \"" << lib << "\" to target \"" << target
<< "\" which is not built in this directory.";
this->IssueMessage(cmake::FATAL_ERROR, e.str());
} }
} }