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

Merge branch 'xcode-framework-paths' into release

This commit is contained in:
Brad King 2013-06-05 09:44:42 -04:00
parent 4b9188825a 21a0beacc1
commit c628fbc40d
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

@ -2028,9 +2028,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))
{ {
@ -2044,7 +2041,6 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
} }
} }
} }
}
if(!fdirs.IsEmpty()) if(!fdirs.IsEmpty())
{ {
buildSettings->AddAttribute("FRAMEWORK_SEARCH_PATHS", buildSettings->AddAttribute("FRAMEWORK_SEARCH_PATHS",