diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-05 13:39:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-05 13:39:52 (GMT) |
| commit | aa025cc60a56da31dfe8461faec0dc3aa517cc10 (patch) | |
| tree | 6d6be10807512b89d2832c7b2ed386b68245bc42 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | c02f01b0397dc39346d1d07dd03c4515590482b3 (diff) | |
| parent | 21a0beacc1d8c452f13453b22f36c91fbbd0a182 (diff) | |
| download | CMake-aa025cc60a56da31dfe8461faec0dc3aa517cc10.zip CMake-aa025cc60a56da31dfe8461faec0dc3aa517cc10.tar.gz CMake-aa025cc60a56da31dfe8461faec0dc3aa517cc10.tar.bz2 | |
Merge topic 'xcode-framework-paths'
21a0bea Xcode: Fix framework search paths in STATIC library targets (#14191)
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -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 a13b4f3..5083cb3 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2087,20 +2087,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()); } } } |