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

Xcode: Fix duplicate target subfolders (#14133) 

Fix logic introduced by commit eeeeca10 (XCode: Support target folders
on XCode, 2011-02-20) to avoid duplicate subfolders.  The problem was
that no slash was appended to the curr_tgt_folder string on the it !=
this->TargetGroup.end() path.
This commit is contained in:
Stephan Tolksdorf 2013-12-02 09:09:22 -05:00 committed by Brad King
parent b80ef72b4d
commit 2dcb1dc9ca
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;