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

Merge branch 'backport-xcode-duplicate-file-refs' into release

Browse Source
This commit is contained in:
Brad King 2014-09-03 13:04:41 -04:00
commit a1eb90c85d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmGlobalXCodeGenerator.cxx
View File

@ -837,16 +837,14 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
cmTarget& cmtarget, cmTarget& cmtarget,
const std::string &lang) const std::string &lang)
{ {
std::string fname = fullpath; cmStdString key = GetGroupMapKeyFromPath(cmtarget, fullpath);
cmXCodeObject* fileRef = this->FileRefs[fname]; cmXCodeObject* fileRef = this->FileRefs[key];
if(!fileRef) if(!fileRef)
{ {
fileRef = this->CreateObject(cmXCodeObject::PBXFileReference); fileRef = this->CreateObject(cmXCodeObject::PBXFileReference);
std::string comment = fname; fileRef->SetComment(fullpath.c_str());
fileRef->SetComment(fname.c_str()); this->FileRefs[key] = fileRef;
this->FileRefs[fname] = fileRef;
} }
cmStdString key = GetGroupMapKeyFromPath(cmtarget, fullpath);
cmXCodeObject* group = this->GroupMap[key]; cmXCodeObject* group = this->GroupMap[key];
cmXCodeObject* children = group->GetObject("children"); cmXCodeObject* children = group->GetObject("children");
if (!children->HasObject(fileRef)) if (!children->HasObject(fileRef))