summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-12-03 14:30:14 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-12-03 14:30:14 (GMT)
commitc1612dbd23a8f0e7f25a30a1e6a5025351e58dff (patch)
treefa3324abf6a2ef3f15ec915c4a5ed95d3287c05d /Source
parentb92dc1042823533b45a9da47565a4337f44c1e75 (diff)
parent2dcb1dc9ca0302288cc931403557785d3c3667cf (diff)
downloadCMake-c1612dbd23a8f0e7f25a30a1e6a5025351e58dff.zip
CMake-c1612dbd23a8f0e7f25a30a1e6a5025351e58dff.tar.gz
CMake-c1612dbd23a8f0e7f25a30a1e6a5025351e58dff.tar.bz2
Merge topic 'xcode-folder-dedup'
2dcb1dc Xcode: Fix duplicate target subfolders (#14133)
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index be0459d..215d483 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3031,23 +3031,23 @@ cmXCodeObject* cmGlobalXCodeGenerator
cmStdString curr_tgt_folder;
for(std::vector<std::string>::size_type i = 0; i < tgt_folders.size();i++)
{
- curr_tgt_folder += tgt_folders[i];
- it = this->TargetGroup.find(curr_tgt_folder);
- if(it == this->TargetGroup.end())
+ if (i != 0)
{
- tgroup = this->CreatePBXGroup(tgroup,tgt_folders[i]);
- this->TargetGroup[curr_tgt_folder] = tgroup;
+ curr_tgt_folder += "/";
}
- else
+ curr_tgt_folder += tgt_folders[i];
+ it = this->TargetGroup.find(curr_tgt_folder);
+ if(it != this->TargetGroup.end())
{
tgroup = it->second;
continue;
}
+ tgroup = this->CreatePBXGroup(tgroup,tgt_folders[i]);
+ this->TargetGroup[curr_tgt_folder] = tgroup;
if(i == 0)
{
this->SourcesGroupChildren->AddObject(tgroup);
}
- curr_tgt_folder += "/";
}
}
this->TargetGroup[target] = tgroup;