diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-08 10:21:36 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-10 18:38:54 (GMT) |
| commit | 69295812065a5d07c07347add2fdcf8f36f993ba (patch) | |
| tree | bbbc09283580c75e2305be1024b6202da2ea423a /Source/cmMakefileTargetGenerator.cxx | |
| parent | 5b361fdda0f2808f0368b746a880981ebda0ade0 (diff) | |
| download | CMake-69295812065a5d07c07347add2fdcf8f36f993ba.zip CMake-69295812065a5d07c07347add2fdcf8f36f993ba.tar.gz CMake-69295812065a5d07c07347add2fdcf8f36f993ba.tar.bz2 | |
Makefiles: Port CreateLinkLibs to cmLinkLineComputer
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 7232248..d507326 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1599,18 +1599,14 @@ cmLinkLineComputer* cmMakefileTargetGenerator::CreateLinkLineComputer( } void cmMakefileTargetGenerator::CreateLinkLibs( - std::string& linkLibs, bool relink, bool useResponseFile, - std::vector<std::string>& makefile_depends, bool useWatcomQuote) + cmLinkLineComputer* linkLineComputer, std::string& linkLibs, bool relink, + bool useResponseFile, std::vector<std::string>& makefile_depends, + bool useWatcomQuote) { std::string frameworkPath; std::string linkPath; - - CM_AUTO_PTR<cmLinkLineComputer> linkLineComputer( - this->CreateLinkLineComputer( - this->LocalGenerator->GetStateSnapshot().GetDirectory())); - this->LocalGenerator->OutputLinkLibraries( - linkLineComputer.get(), linkLibs, frameworkPath, linkPath, + linkLineComputer, linkLibs, frameworkPath, linkPath, *this->GeneratorTarget, relink, useResponseFile, useWatcomQuote); linkLibs = frameworkPath + linkPath + linkLibs; |