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/cmMakefileTargetGenerator.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/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index e8a9fd1..e5b163b 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1833,6 +1833,20 @@ cmMakefileTargetGenerator //---------------------------------------------------------------------------- void cmMakefileTargetGenerator +::CreateLinkLibs(std::string& linkLibs, bool relink, + std::vector<std::string>& makefile_depends) +{ + std::string frameworkPath; + std::string linkPath; + this->LocalGenerator + ->OutputLinkLibraries(linkLibs, frameworkPath, linkPath, + *this->GeneratorTarget, relink); + linkLibs = frameworkPath + linkPath + linkLibs; +} + +//---------------------------------------------------------------------------- +void +cmMakefileTargetGenerator ::CreateObjectLists(bool useLinkScript, bool useArchiveRules, bool useResponseFile, std::string& buildObjs, std::vector<std::string>& makefile_depends) |