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/cmNinjaNormalTargetGenerator.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/cmNinjaNormalTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index a13e1f0..9490658 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -420,12 +420,17 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() cmNinjaDeps explicitDeps = this->GetObjects(); cmNinjaDeps implicitDeps = this->ComputeLinkDeps(); + std::string frameworkPath; + std::string linkPath; this->GetLocalGenerator()->GetTargetFlags(vars["LINK_LIBRARIES"], vars["FLAGS"], vars["LINK_FLAGS"], + frameworkPath, + linkPath, this->GetGeneratorTarget()); this->AddModuleDefinitionFlag(vars["LINK_FLAGS"]); + vars["LINK_FLAGS"] += frameworkPath + linkPath; // Compute architecture specific link flags. Yes, these go into a different // variable for executables, probably due to a mistake made when duplicating |