diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-05 13:44:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-06-05 13:44:42 (GMT) |
| commit | c628fbc40df01739df9b8134719ee7014897e84e (patch) | |
| tree | 0d126b7db7eab846e256261a98c29c23a021f1d7 | |
| parent | 4b9188825a0c61ce370855d2ce42da97dc7b9a7f (diff) | |
| parent | 21a0beacc1d8c452f13453b22f36c91fbbd0a182 (diff) | |
| download | CMake-c628fbc40df01739df9b8134719ee7014897e84e.zip CMake-c628fbc40df01739df9b8134719ee7014897e84e.tar.gz CMake-c628fbc40df01739df9b8134719ee7014897e84e.tar.bz2 | |
Merge branch 'xcode-framework-paths' into release
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index ceac564..3092abf 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2028,20 +2028,16 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target, dirs.Add(incpath.c_str()); } } - if(target.GetType() != cmTarget::OBJECT_LIBRARY && - target.GetType() != cmTarget::STATIC_LIBRARY) + // Add framework search paths needed for linking. + if(cmComputeLinkInformation* cli = target.GetLinkInformation(configName)) { - // Add framework search paths needed for linking. - if(cmComputeLinkInformation* cli = target.GetLinkInformation(configName)) + std::vector<std::string> const& fwDirs = cli->GetFrameworkPaths(); + for(std::vector<std::string>::const_iterator fdi = fwDirs.begin(); + fdi != fwDirs.end(); ++fdi) { - std::vector<std::string> const& fwDirs = cli->GetFrameworkPaths(); - for(std::vector<std::string>::const_iterator fdi = fwDirs.begin(); - fdi != fwDirs.end(); ++fdi) + if(emitted.insert(*fdi).second) { - if(emitted.insert(*fdi).second) - { - fdirs.Add(this->XCodeEscapePath(fdi->c_str()).c_str()); - } + fdirs.Add(this->XCodeEscapePath(fdi->c_str()).c_str()); } } } |