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

Merge topic 'xcode-folder-dedup'

Browse Source 
2dcb1dc Xcode: Fix duplicate target subfolders (#14133)
This commit is contained in:
Brad King 2013-12-03 09:30:14 -05:00 committed by CMake Topic Stage
commit c1612dbd23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmGlobalXCodeGenerator.cxx
View File

@ -3031,23 +3031,23 @@ cmXCodeObject* cmGlobalXCodeGenerator
cmStdString curr_tgt_folder; cmStdString curr_tgt_folder;
for(std::vector<std::string>::size_type i = 0; i < tgt_folders.size();i++) for(std::vector<std::string>::size_type i = 0; i < tgt_folders.size();i++)
{ {
if (i != 0)
{
curr_tgt_folder += "/";
}
curr_tgt_folder += tgt_folders[i]; curr_tgt_folder += tgt_folders[i];
it = this->TargetGroup.find(curr_tgt_folder); it = this->TargetGroup.find(curr_tgt_folder);
if(it == this->TargetGroup.end()) if(it != this->TargetGroup.end())
{
tgroup = this->CreatePBXGroup(tgroup,tgt_folders[i]);
this->TargetGroup[curr_tgt_folder] = tgroup;
}
else
{ {
tgroup = it->second; tgroup = it->second;
continue; continue;
} }
tgroup = this->CreatePBXGroup(tgroup,tgt_folders[i]);
this->TargetGroup[curr_tgt_folder] = tgroup;
if(i == 0) if(i == 0)
{ {
this->SourcesGroupChildren->AddObject(tgroup); this->SourcesGroupChildren->AddObject(tgroup);
} }
curr_tgt_folder += "/";
} }
} }
this->TargetGroup[target] = tgroup; this->TargetGroup[target] = tgroup;