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/cmGhsMultiTargetGenerator.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/cmGhsMultiTargetGenerator.cxx')
| -rw-r--r-- | Source/cmGhsMultiTargetGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index 04c45e5..5fbaea4 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -367,10 +367,11 @@ void cmGhsMultiTargetGenerator::WriteTargetLinkLibraries( this->GetGlobalGenerator()->CreateLinkLineComputer( this->LocalGenerator, this->LocalGenerator->GetStateSnapshot().GetDirectory())); + linkLineComputer->SetUseWatcomQuote(useWatcomQuote); this->LocalGenerator->GetTargetFlags( linkLineComputer.get(), config, linkLibraries, flags, linkFlags, - frameworkPath, linkPath, this->GeneratorTarget, useWatcomQuote); + frameworkPath, linkPath, this->GeneratorTarget); linkFlags = cmSystemTools::TrimWhitespace(linkFlags); if (!linkPath.empty()) { |