summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2012-09-26 12:38:15 (GMT)
committerBrad King <brad.king@kitware.com>2012-10-01 21:06:38 (GMT)
commit8d674e78449d4bcde669ee5c4a6c0809c0ee51a5 (patch)
treed4c6ba81d8de360273e5d43f0d2ecc81e50642f7 /Source/cmake.cxx
parentdbd99d6fbbdf76181ac01ec9cc32fd3b67a4ce7c (diff)
downloadCMake-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/cmake.cxx')
-rw-r--r--Source/cmake.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 745d513..0123427 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -628,10 +628,14 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
std::string linkLibs;
+ std::string frameworkPath;
+ std::string linkPath;
std::string flags;
std::string linkFlags;
cmGeneratorTarget gtgt(tgt);
- lg->GetTargetFlags(linkLibs, flags, linkFlags, &gtgt);
+ lg->GetTargetFlags(linkLibs, frameworkPath, linkPath, flags, linkFlags,
+ &gtgt);
+ linkLibs = frameworkPath + linkPath + linkLibs;
printf("%s\n", linkLibs.c_str() );