[Cmake-commits] CMake branch, next, updated. v3.0.1-5142-g7cfdb94

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7cfdb94d762d1e4306ed4498fdda6f76222cbd89 (commit)
       via  d73f8828ca349bcb97dbc779bf1cf6fde3a62390 (commit)
       via  e7114226e6af60b9d214dba26d44648f530e4d96 (commit)
      from  17d5f976be071bc2d89d27e2cfb4ae7600c04a73 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7cfdb94d762d1e4306ed4498fdda6f76222cbd89
commit 7cfdb94d762d1e4306ed4498fdda6f76222cbd89
Merge: 17d5f97 d73f882
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 4 09:47:48 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 4 09:47:48 2014 -0400

    Merge topic 'xcode-duplicate-file-refs' into next
    
    d73f8828 Merge branch 'backport-xcode-duplicate-file-refs' into xcode-duplicate-file-refs
    e7114226 Xcode: Generate per-target file references (#15111)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d73f8828ca349bcb97dbc779bf1cf6fde3a62390
commit d73f8828ca349bcb97dbc779bf1cf6fde3a62390
Merge: cf92fe2 e711422
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 3 13:06:01 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 3 13:06:01 2014 -0400

    Merge branch 'backport-xcode-duplicate-file-refs' into xcode-duplicate-file-refs
    
    Resolve conflicts in Source/cmGlobalXCodeGenerator.cxx in favor of our
    side.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7114226e6af60b9d214dba26d44648f530e4d96
commit e7114226e6af60b9d214dba26d44648f530e4d96
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 3 11:54:05 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 3 12:45:37 2014 -0400

    Xcode: Generate per-target file references (#15111)
    
    Xcode requires a separate PBXFileReference for each target source group
    that references a source file.  Xcode 6 now diagnoses re-use of the same
    PBXFileReference from multiple source groups.  Add the referencing
    target name to our internal map key so we use a per-target reference.

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

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake