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/cmMakefileLibraryTargetGenerator.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/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 368d6fc..d39e7fa 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -542,11 +542,15 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules this->LocalGenerator->SetLinkScriptShell(useLinkScript); // Collect up flags to link in needed libraries. - cmOStringStream linklibs; + std::string linkLibs; if(this->Target->GetType() != cmTarget::STATIC_LIBRARY) { + std::string frameworkPath; + std::string linkPath; this->LocalGenerator - ->OutputLinkLibraries(linklibs, *this->GeneratorTarget, relink); + ->OutputLinkLibraries(linkLibs, frameworkPath, linkPath, + *this->GeneratorTarget, relink); + linkLibs = frameworkPath + linkPath + linkLibs; } // Construct object file lists that may be needed to expand the @@ -587,8 +591,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules cmLocalGenerator::SHELL); vars.ObjectDir = objdir.c_str(); vars.Target = targetOutPathReal.c_str(); - std::string linkString = linklibs.str(); - vars.LinkLibraries = linkString.c_str(); + vars.LinkLibraries = linkLibs.c_str(); vars.ObjectsQuoted = buildObjs.c_str(); if (this->Target->HasSOName(this->ConfigName)) { |