From 1afacebee9c42a0dccaf554db9cb048204913d38 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 12 Apr 2017 14:56:37 -0400 Subject: Xcode: Do not add Object Libraries source group on Xcode >= 5 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. --- Source/cmGlobalXCodeGenerator.cxx | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index d07cc3d..b7ff7f3 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2799,17 +2799,20 @@ bool cmGlobalXCodeGenerator::CreateGroups( this->GroupMap[key] = pbxgroup; } - // Put OBJECT_LIBRARY objects in proper groups: - std::vector objs; - gtgt->UseObjectLibraries(objs, ""); - for (std::vector::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 objs; + gtgt->UseObjectLibraries(objs, ""); + for (std::vector::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; + } } } } -- cgit v0.12