diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-08 10:21:38 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-10 18:38:59 (GMT) |
| commit | 77c4202edc242c96087295585a85a20700bdb26f (patch) | |
| tree | fd0c780e1e758ed43e5b2958cd467cca9ad78c7a /Source/cmMakefileTargetGenerator.cxx | |
| parent | 09b6cc66b09b9689ca01faee5e33ef101b46f972 (diff) | |
| download | CMake-77c4202edc242c96087295585a85a20700bdb26f.zip CMake-77c4202edc242c96087295585a85a20700bdb26f.tar.gz CMake-77c4202edc242c96087295585a85a20700bdb26f.tar.bz2 | |
cmLinkLineComputer: Move RPath computation from cmLocalGenerator
Add state for Relink and populate it at the point of cmLinkLineComputer
initialization. This allows removal of the parameter in go-between
methods.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index d9102a6..2c0c91c 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1601,7 +1601,7 @@ cmLinkLineComputer* cmMakefileTargetGenerator::CreateLinkLineComputer( } void cmMakefileTargetGenerator::CreateLinkLibs( - cmLinkLineComputer* linkLineComputer, std::string& linkLibs, bool relink, + cmLinkLineComputer* linkLineComputer, std::string& linkLibs, bool useResponseFile, std::vector<std::string>& makefile_depends, bool useWatcomQuote) { @@ -1611,7 +1611,7 @@ void cmMakefileTargetGenerator::CreateLinkLibs( cmComputeLinkInformation* pcli = this->GeneratorTarget->GetLinkInformation(config); this->LocalGenerator->OutputLinkLibraries(pcli, linkLineComputer, linkLibs, - frameworkPath, linkPath, relink, + frameworkPath, linkPath, useResponseFile, useWatcomQuote); linkLibs = frameworkPath + linkPath + linkLibs; |