summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2016-10-08 10:21:39 (GMT)
committerStephen Kelly <steveire@gmail.com>2016-10-10 18:38:59 (GMT)
commit4134030434ea88024ef46f9f00b19513fc3cec4c (patch)
tree2eab60a4a8704dff0b8cdec8dfc8ccd4fd3288b8 /Source/cmLocalGenerator.cxx
parentf03d446e967af91460ff31eb52d840983b3d8cec (diff)
downloadCMake-4134030434ea88024ef46f9f00b19513fc3cec4c.zip
CMake-4134030434ea88024ef46f9f00b19513fc3cec4c.tar.gz
CMake-4134030434ea88024ef46f9f00b19513fc3cec4c.tar.bz2
cmLinkLineComputer: Extract link libraries computation from cmLocalGenerator
Hide some methods which no longer need to be public.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx30
1 files changed, 4 insertions, 26 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index ef9e355..3b19694 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1207,7 +1207,7 @@ void cmLocalGenerator::GetTargetFlags(
}
if (pcli) {
this->OutputLinkLibraries(pcli, linkLineComputer, linkLibs,
- frameworkPath, linkPath, false);
+ frameworkPath, linkPath);
}
} break;
case cmState::EXECUTABLE: {
@@ -1229,7 +1229,7 @@ void cmLocalGenerator::GetTargetFlags(
this->AddLanguageFlags(flags, linkLanguage, buildType);
if (pcli) {
this->OutputLinkLibraries(pcli, linkLineComputer, linkLibs,
- frameworkPath, linkPath, false);
+ frameworkPath, linkPath);
}
if (cmSystemTools::IsOn(
this->Makefile->GetDefinition("BUILD_SHARED_LIBS"))) {
@@ -1397,7 +1397,7 @@ std::string cmLocalGenerator::GetTargetFortranFlags(
void cmLocalGenerator::OutputLinkLibraries(
cmComputeLinkInformation* pcli, cmLinkLineComputer* linkLineComputer,
std::string& linkLibraries, std::string& frameworkPath,
- std::string& linkPath, bool forResponseFile)
+ std::string& linkPath)
{
cmComputeLinkInformation& cli = *pcli;
@@ -1428,29 +1428,7 @@ void cmLocalGenerator::OutputLinkLibraries(
linkPath =
linkLineComputer->ComputeLinkPath(cli, libPathFlag, libPathTerminator);
- std::string linkLibs = linkLineComputer->ComputeLinkLibs(cli);
-
- std::string rpath = linkLineComputer->ComputeRPath(cli);
-
- std::ostringstream fout;
- fout << rpath;
-
- // Write the library flags to the build rule.
- fout << linkLibs;
-
- // Add the linker runtime search path if any.
- std::string rpath_link = cli.GetRPathLinkString();
- if (!cli.GetRPathLinkFlag().empty() && !rpath_link.empty()) {
- fout << cli.GetRPathLinkFlag();
- fout << this->EscapeForShell(rpath_link, !forResponseFile);
- fout << " ";
- }
-
- if (!stdLibString.empty()) {
- fout << stdLibString << " ";
- }
-
- linkLibraries = fout.str();
+ linkLibraries = linkLineComputer->ComputeLinkLibraries(cli, stdLibString);
}
std::string cmLocalGenerator::GetLinkLibsCMP0065(