diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-08 10:21:39 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-10 18:38:59 (GMT) |
| commit | f03d446e967af91460ff31eb52d840983b3d8cec (patch) | |
| tree | e8df2117109455b620bb4744ef51358bf8436fa8 /Source/cmMakefileTargetGenerator.cxx | |
| parent | 3444105f9fe4fcee390c8d616e1a211a078a630b (diff) | |
| download | CMake-f03d446e967af91460ff31eb52d840983b3d8cec.zip CMake-f03d446e967af91460ff31eb52d840983b3d8cec.tar.gz CMake-f03d446e967af91460ff31eb52d840983b3d8cec.tar.bz2 | |
cmLinkLineComputer: Move FrameworkPath computation from cmLocalGenerator
Add UseWatcomQuote state, and remove corresponding method parameters.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 2c0c91c..e93c31d 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1602,8 +1602,7 @@ cmLinkLineComputer* cmMakefileTargetGenerator::CreateLinkLineComputer( void cmMakefileTargetGenerator::CreateLinkLibs( cmLinkLineComputer* linkLineComputer, std::string& linkLibs, - bool useResponseFile, std::vector<std::string>& makefile_depends, - bool useWatcomQuote) + bool useResponseFile, std::vector<std::string>& makefile_depends) { std::string frameworkPath; std::string linkPath; @@ -1612,7 +1611,7 @@ void cmMakefileTargetGenerator::CreateLinkLibs( this->GeneratorTarget->GetLinkInformation(config); this->LocalGenerator->OutputLinkLibraries(pcli, linkLineComputer, linkLibs, frameworkPath, linkPath, - useResponseFile, useWatcomQuote); + useResponseFile); linkLibs = frameworkPath + linkPath + linkLibs; if (useResponseFile && linkLibs.find_first_not_of(' ') != linkLibs.npos) { |