mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 19:00:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Xcode: Do not add Object Libraries source group on Xcode >= 5

Browse Source 
The group is always empty because on Xcode 5 and above we list
object library files directly on the link line and do not list
sources for them.
This commit is contained in:
Brad King
2017-04-12 14:56:37 -04:00
parent fddd559406
commit 1afacebee9
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/cmGlobalXCodeGenerator.cxx
View File

@@ -2799,17 +2799,20 @@ bool cmGlobalXCodeGenerator::CreateGroups(
this->GroupMap[key] = pbxgroup;
}
// Put OBJECT_LIBRARY objects in proper groups:
std::vector<std::string> objs;
gtgt->UseObjectLibraries(objs, "");
for (std::vector<std::string>::const_iterator oi = objs.begin();
oi != objs.end(); ++oi) {
std::string const& source = *oi;
cmSourceGroup* sourceGroup =
mf->FindSourceGroup(source.c_str(), sourceGroups);
cmXCodeObject* pbxgroup = this->CreateOrGetPBXGroup(gtgt, sourceGroup);
std::string key = GetGroupMapKeyFromPath(gtgt, source);
this->GroupMap[key] = pbxgroup;
if (this->XcodeVersion < 50) {
// Put OBJECT_LIBRARY objects in proper groups:
std::vector<std::string> objs;
gtgt->UseObjectLibraries(objs, "");
for (std::vector<std::string>::const_iterator oi = objs.begin();
oi != objs.end(); ++oi) {
std::string const& source = *oi;
cmSourceGroup* sourceGroup =
mf->FindSourceGroup(source.c_str(), sourceGroups);
cmXCodeObject* pbxgroup =
this->CreateOrGetPBXGroup(gtgt, sourceGroup);
std::string key = GetGroupMapKeyFromPath(gtgt, source);
this->GroupMap[key] = pbxgroup;
}
}
}
}