diff options
| author | Brad King <brad.king@kitware.com> | 2012-12-11 20:11:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-12-11 20:15:51 (GMT) |
| commit | ba58d0c06fd8576844a5722930531a95d00c2003 (patch) | |
| tree | 6c7d5f0e42d5cde5e47c20f0cd010f4273b4d830 /Source/cmLocalGenerator.cxx | |
| parent | d0369a9888880c1e9974edd2f6c74b870ac65163 (diff) | |
| download | CMake-ba58d0c06fd8576844a5722930531a95d00c2003.zip CMake-ba58d0c06fd8576844a5722930531a95d00c2003.tar.gz CMake-ba58d0c06fd8576844a5722930531a95d00c2003.tar.bz2 | |
OS X: Link with all framework search paths, not just the last
Refactoring in commit 8d674e78 (Ninja: move -LIBPATH behind -link
option, 2012-09-26) accidentally added code that overwrites the
framework search path flags on each iteration instead of appending.
Change '=' to '+=' to fix it. This affects Makefile and Ninja
generators.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index b41f060..b557ca1 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1708,7 +1708,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries, for(std::vector<std::string>::const_iterator fdi = fwDirs.begin(); fdi != fwDirs.end(); ++fdi) { - frameworkPath = " -F"; + frameworkPath += "-F"; frameworkPath += this->Convert(fdi->c_str(), NONE, SHELL, false); frameworkPath += " "; } |