diff options
| -rw-r--r-- | Source/cmLinkLibrariesCommand.cxx | 2 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 5 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 1 |
3 files changed, 1 insertions, 7 deletions
diff --git a/Source/cmLinkLibrariesCommand.cxx b/Source/cmLinkLibrariesCommand.cxx index bb0e27b..3fc7bd9 100644 --- a/Source/cmLinkLibrariesCommand.cxx +++ b/Source/cmLinkLibrariesCommand.cxx @@ -30,7 +30,7 @@ bool cmLinkLibrariesCommand::InitialPass(std::vector<std::string> const& args, } this->Makefile->AddLinkLibrary(*i, OPTIMIZED_LibraryType); } else { - this->Makefile->AddLinkLibrary(*i); + this->Makefile->AddLinkLibrary(*i, GENERAL_LibraryType); } } diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 0efd92c..3e9837d 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1267,11 +1267,6 @@ void cmMakefile::AddLinkDirectoryForTarget(const std::string& target, } } -void cmMakefile::AddLinkLibrary(const std::string& lib) -{ - this->AddLinkLibrary(lib, GENERAL_LibraryType); -} - void cmMakefile::InitializeFromParent(cmMakefile* parent) { this->SystemIncludeDirectories = parent->SystemIncludeDirectories; diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 92907cd..9ffdd9d 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -199,7 +199,6 @@ public: /** * Add a link library to the build. */ - void AddLinkLibrary(const std::string&); void AddLinkLibrary(const std::string&, cmTargetLinkLibraryType type); void AddLinkLibraryForTarget(const std::string& tgt, const std::string&, cmTargetLinkLibraryType type); |