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 | 7ef834682547df5e0ccdcd503558dcbf1206a638 (patch) | |
| tree | a90aabc08970996773103105c00a45859e197184 /Source/cmMakefileTargetGenerator.cxx | |
| parent | 69295812065a5d07c07347add2fdcf8f36f993ba (diff) | |
| download | CMake-7ef834682547df5e0ccdcd503558dcbf1206a638.zip CMake-7ef834682547df5e0ccdcd503558dcbf1206a638.tar.gz CMake-7ef834682547df5e0ccdcd503558dcbf1206a638.tar.bz2 | |
cmLocalGenerator: Pass link library info to OutputLinkLibraries
Remove the cmGeneratorTarget from the interface.
This is simplification of the OutputLinkLibraries responsibilities so
that it can be broken apart into multiple methods.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index d507326..c74b381 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1605,9 +1605,12 @@ void cmMakefileTargetGenerator::CreateLinkLibs( { std::string frameworkPath; std::string linkPath; - this->LocalGenerator->OutputLinkLibraries( - linkLineComputer, linkLibs, frameworkPath, linkPath, - *this->GeneratorTarget, relink, useResponseFile, useWatcomQuote); + std::string config = this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"); + cmComputeLinkInformation* pcli = + this->GeneratorTarget->GetLinkInformation(config); + this->LocalGenerator->OutputLinkLibraries(pcli, linkLineComputer, linkLibs, + frameworkPath, linkPath, relink, + useResponseFile, useWatcomQuote); linkLibs = frameworkPath + linkPath + linkLibs; if (useResponseFile && linkLibs.find_first_not_of(' ') != linkLibs.npos) { |