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

4
Source/cmGlobalXCodeGenerator.cxx
View File

@ -2087,9 +2087,6 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
dirs.Add(incpath.c_str()); dirs.Add(incpath.c_str());
} }
} }
if(target.GetType() != cmTarget::OBJECT_LIBRARY &&
target.GetType() != cmTarget::STATIC_LIBRARY)
{
// Add framework search paths needed for linking. // Add framework search paths needed for linking.
if(cmComputeLinkInformation* cli = target.GetLinkInformation(configName)) if(cmComputeLinkInformation* cli = target.GetLinkInformation(configName))
{ {
@ -2103,7 +2100,6 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
} }
} }
} }
}
if(!fdirs.IsEmpty()) if(!fdirs.IsEmpty())
{ {
buildSettings->AddAttribute("FRAMEWORK_SEARCH_PATHS", buildSettings->AddAttribute("FRAMEWORK_SEARCH_PATHS",