diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2012-09-26 12:38:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-10-01 21:06:38 (GMT) |
| commit | 8d674e78449d4bcde669ee5c4a6c0809c0ee51a5 (patch) | |
| tree | d4c6ba81d8de360273e5d43f0d2ecc81e50642f7 /Source/cmMakefileExecutableTargetGenerator.cxx | |
| parent | dbd99d6fbbdf76181ac01ec9cc32fd3b67a4ce7c (diff) | |
| download | CMake-8d674e78449d4bcde669ee5c4a6c0809c0ee51a5.zip CMake-8d674e78449d4bcde669ee5c4a6c0809c0ee51a5.tar.gz CMake-8d674e78449d4bcde669ee5c4a6c0809c0ee51a5.tar.bz2 | |
Ninja: move -LIBPATH behind -link option
Don' pass linker option to the compile
Diffstat (limited to 'Source/cmMakefileExecutableTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index ca5f26a..da66656 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -318,10 +318,13 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) this->LocalGenerator->SetLinkScriptShell(useLinkScript); // Collect up flags to link in needed libraries. - cmOStringStream linklibs; - this->LocalGenerator->OutputLinkLibraries(linklibs, *this->GeneratorTarget, + std::string linkLibs; + std::string frameworkPath; + std::string linkPath; + this->LocalGenerator->OutputLinkLibraries(linkLibs, frameworkPath, linkPath, + *this->GeneratorTarget, relink); - + linkLibs = frameworkPath + linkPath + linkLibs; // Construct object file lists that may be needed to expand the // rule. std::string buildObjs; @@ -360,8 +363,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) vars.TargetVersionMajor = targetVersionMajor.c_str(); vars.TargetVersionMinor = targetVersionMinor.c_str(); - std::string linkString = linklibs.str(); - vars.LinkLibraries = linkString.c_str(); + vars.LinkLibraries = linkLibs.c_str(); vars.Flags = flags.c_str(); vars.LinkFlags = linkFlags.c_str(); // Expand placeholders in the commands. |