summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-10-07 18:13:35 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-10-07 18:13:35 (GMT)
commit2b7baed719e4a6eb918ed6f22ee6031a40b7f316 (patch)
treef3c6b31bf958fa7e5bb9216e782a865c9dba2471
parent7ba954925a876f4c753a4296236bc7d2f18eb0b8 (diff)
downloadCMake-2b7baed719e4a6eb918ed6f22ee6031a40b7f316.zip
CMake-2b7baed719e4a6eb918ed6f22ee6031a40b7f316.tar.gz
CMake-2b7baed719e4a6eb918ed6f22ee6031a40b7f316.tar.bz2
cmMakefile: Inline method into only caller
cmMakefile should not have API which is only useful for deprecated systems like cmPluginAPI.
-rw-r--r--Source/cmCPluginAPI.cxx9
-rw-r--r--Source/cmMakefile.cxx14
-rw-r--r--Source/cmMakefile.h1
3 files changed, 8 insertions, 16 deletions
diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index 3a08aea..2498ecb 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -162,7 +162,14 @@ void CCONV cmAddLinkDirectoryForTarget(void* arg, const char* tgt,
const char* d)
{
cmMakefile* mf = static_cast<cmMakefile*>(arg);
- mf->AddLinkDirectoryForTarget(tgt, d);
+ cmTarget* t = mf->FindLocalNonAliasTarget(tgt);
+ if (!t) {
+ cmSystemTools::Error(
+ "Attempt to add link directories to non-existent target: ", tgt,
+ " for directory ", d);
+ return;
+ }
+ t->AddLinkDirectory(d);
}
void CCONV cmAddExecutable(void* arg, const char* exename, int numSrcs,
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d2be29c..f2db37e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1245,20 +1245,6 @@ void cmMakefile::AddLinkLibraryForTarget(const std::string& target,
i->second.AddLinkLibrary(*this, target, lib, llt);
}
-void cmMakefile::AddLinkDirectoryForTarget(const std::string& target,
- const std::string& d)
-{
- cmTarget* t = this->FindLocalNonAliasTarget(target);
- if (!t) {
- cmSystemTools::Error(
- "Attempt to add link directories to non-existent target: ",
- target.c_str(), " for directory ", d.c_str());
- return;
- }
-
- t->AddLinkDirectory(d);
-}
-
void cmMakefile::InitializeFromParent(cmMakefile* parent)
{
this->SystemIncludeDirectories = parent->SystemIncludeDirectories;
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 9ffdd9d..76afcbc 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -202,7 +202,6 @@ public:
void AddLinkLibrary(const std::string&, cmTargetLinkLibraryType type);
void AddLinkLibraryForTarget(const std::string& tgt, const std::string&,
cmTargetLinkLibraryType type);
- void AddLinkDirectoryForTarget(const std::string& tgt, const std::string& d);
/**
* Add a subdirectory to the build.