mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmMakefile: Return after error and remove else condition

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

37
Source/cmMakefile.cxx
View File

@@ -1226,25 +1226,26 @@ void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
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);
if (tgt) {
// if it is not a static or shared library then you can not link to it
if (!((tgt->GetType() == cmState::STATIC_LIBRARY) ||
(tgt->GetType() == cmState::SHARED_LIBRARY) ||
(tgt->GetType() == cmState::INTERFACE_LIBRARY) ||
tgt->IsExecutableWithExports())) {
std::ostringstream e;
e << "Target \"" << lib << "\" of type "
<< cmState::GetTargetTypeName(tgt->GetType())
<< " may not be linked into another target. "
<< "One may link only to STATIC or SHARED libraries, or "
<< "to executables with the ENABLE_EXPORTS property set.";
this->IssueMessage(cmake::FATAL_ERROR, e.str());
}
}
i->second.AddLinkLibrary(*this, target, lib, llt);
return;
}
cmTarget* tgt = this->GetGlobalGenerator()->FindTarget(lib);
if (tgt) {
// if it is not a static or shared library then you can not link to it
if (!((tgt->GetType() == cmState::STATIC_LIBRARY) ||
(tgt->GetType() == cmState::SHARED_LIBRARY) ||
(tgt->GetType() == cmState::INTERFACE_LIBRARY) ||
tgt->IsExecutableWithExports())) {
std::ostringstream e;
e << "Target \"" << lib << "\" of type "
<< cmState::GetTargetTypeName(tgt->GetType())
<< " may not be linked into another target. "
<< "One may link only to STATIC or SHARED libraries, or "
<< "to executables with the ENABLE_EXPORTS property set.";
this->IssueMessage(cmake::FATAL_ERROR, e.str());
}
}
i->second.AddLinkLibrary(*this, target, lib, llt);
}
void cmMakefile::AddLinkDirectoryForTarget(const std::string& target,