kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'xcode-framework-paths'

Browse Source 
21a0bea Xcode: Fix framework search paths in STATIC library targets (#14191)
This commit is contained in:
Brad King 2013-06-05 09:39:52 -04:00 committed by CMake Topic Stage
commit aa025cc60a
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmGlobalXCodeGenerator.cxx
View File

@ -2087,20 +2087,16 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
dirs.Add(incpath.c_str()); dirs.Add(incpath.c_str());
} }
} }
if(target.GetType() != cmTarget::OBJECT_LIBRARY && // Add framework search paths needed for linking.
target.GetType() != cmTarget::STATIC_LIBRARY) if(cmComputeLinkInformation* cli = target.GetLinkInformation(configName))
{ {
// Add framework search paths needed for linking. std::vector<std::string> const& fwDirs = cli->GetFrameworkPaths();
if(cmComputeLinkInformation* cli = target.GetLinkInformation(configName)) for(std::vector<std::string>::const_iterator fdi = fwDirs.begin();
fdi != fwDirs.end(); ++fdi)
{ {
std::vector<std::string> const& fwDirs = cli->GetFrameworkPaths(); if(emitted.insert(*fdi).second)
for(std::vector<std::string>::const_iterator fdi = fwDirs.begin();
fdi != fwDirs.end(); ++fdi)
{ {
if(emitted.insert(*fdi).second) fdirs.Add(this->XCodeEscapePath(fdi->c_str()).c_str());
{
fdirs.Add(this->XCodeEscapePath(fdi->c_str()).c_str());
}
} }
} }
} }