diff options
author | Brad King <brad.king@kitware.com> | 2014-03-04 16:20:27 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-03-04 16:20:27 (GMT) |
commit | c87517099abbef70b9718a3920954e9097f36bbe (patch) | |
tree | a04557e21e115e4aee39ee629ff30d554127339b /Source/cmMakefileExecutableTargetGenerator.cxx | |
parent | 74b982ce734dd55a4155ba8ba0462fef894d6ec0 (diff) | |
download | CMake-c87517099abbef70b9718a3920954e9097f36bbe.zip CMake-c87517099abbef70b9718a3920954e9097f36bbe.tar.gz CMake-c87517099abbef70b9718a3920954e9097f36bbe.tar.bz2 |
Makefile: Factor out some duplicate link libraries generation
The generators for executable and library targets duplicate the logic to
call the OutputLinkLibraries helper on the local generator. Factor it
out into a cmMakefileTargetGenerator::CreateLinkLibs method to avoid
dpulication.
Diffstat (limited to 'Source/cmMakefileExecutableTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index 03fdda2..696ce94 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -325,12 +325,8 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) // Collect up flags to link in needed libraries. std::string linkLibs; - std::string frameworkPath; - std::string linkPath; - this->LocalGenerator->OutputLinkLibraries(linkLibs, frameworkPath, linkPath, - *this->GeneratorTarget, - relink); - linkLibs = frameworkPath + linkPath + linkLibs; + this->CreateLinkLibs(linkLibs, relink, depends); + // Construct object file lists that may be needed to expand the // rule. std::string buildObjs; |