mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-06 06:38:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmMakefile: Inline method into only remaining caller

Browse Source
This commit is contained in:
Stephen Kelly
2016-10-07 20:13:36 +02:00
parent 7edfcd0e83
commit 17ab8e33f0
3 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Source/cmCPluginAPI.cxx
View File

@@ -337,6 +337,35 @@ void CCONV cmAddCustomCommandToTarget(void* arg, const char* target,
cctype, no_comment, no_working_dir); cctype, no_comment, no_working_dir);
} }
static void addLinkLibrary(cmMakefile* mf, std::string const& target,
std::string const& lib, cmTargetLinkLibraryType llt)
{
cmTarget* t = mf->FindLocalNonAliasTarget(target);
if (!t) {
std::ostringstream e;
e << "Attempt to add link library \"" << lib << "\" to target \"" << target
<< "\" which is not built in this directory.";
mf->IssueMessage(cmake::FATAL_ERROR, e.str());
return;
}
cmTarget* tgt = mf->GetGlobalGenerator()->FindTarget(lib);
if (tgt && (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.";
mf->IssueMessage(cmake::FATAL_ERROR, e.str());
}
t->AddLinkLibrary(*mf, lib, llt);
}
void CCONV cmAddLinkLibraryForTarget(void* arg, const char* tgt, void CCONV cmAddLinkLibraryForTarget(void* arg, const char* tgt,
const char* value, int libtype) const char* value, int libtype)
{ {
@@ -344,13 +373,13 @@ void CCONV cmAddLinkLibraryForTarget(void* arg, const char* tgt,
switch (libtype) { switch (libtype) {
case CM_LIBRARY_GENERAL: case CM_LIBRARY_GENERAL:
mf->AddLinkLibraryForTarget(tgt, value, GENERAL_LibraryType); addLinkLibrary(mf, tgt, value, GENERAL_LibraryType);
break; break;
case CM_LIBRARY_DEBUG: case CM_LIBRARY_DEBUG:
mf->AddLinkLibraryForTarget(tgt, value, DEBUG_LibraryType); addLinkLibrary(mf, tgt, value, DEBUG_LibraryType);
break; break;
case CM_LIBRARY_OPTIMIZED: case CM_LIBRARY_OPTIMIZED:
mf->AddLinkLibraryForTarget(tgt, value, OPTIMIZED_LibraryType); addLinkLibrary(mf, tgt, value, OPTIMIZED_LibraryType);
break; break;
} }
} }

29
Source/cmMakefile.cxx
View File

@@ -1216,35 +1216,6 @@ void cmMakefile::AddLinkLibrary(const std::string& lib,
this->LinkLibraries.push_back(tmp); this->LinkLibraries.push_back(tmp);
} }
void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
const std::string& lib,
cmTargetLinkLibraryType llt)
{
cmTarget* t = this->FindLocalNonAliasTarget(target);
if (!t) {
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());
return;
}
cmTarget* tgt = this->GetGlobalGenerator()->FindTarget(lib);
if (tgt && (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());
}
t->AddLinkLibrary(*this, lib, llt);
}
void cmMakefile::InitializeFromParent(cmMakefile* parent) void cmMakefile::InitializeFromParent(cmMakefile* parent)
{ {
this->SystemIncludeDirectories = parent->SystemIncludeDirectories; this->SystemIncludeDirectories = parent->SystemIncludeDirectories;

2
Source/cmMakefile.h
View File

@@ -200,8 +200,6 @@ public:
* Add a link library to the build. * Add a link library to the build.
*/ */
void AddLinkLibrary(const std::string&, cmTargetLinkLibraryType type); void AddLinkLibrary(const std::string&, cmTargetLinkLibraryType type);
void AddLinkLibraryForTarget(const std::string& tgt, const std::string&,
cmTargetLinkLibraryType type);
/** /**
* Add a subdirectory to the build. * Add a subdirectory to the build.