[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5953-g3478bd5

[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  3478bd5a6b263e8f0ca7d715205aaf1f4d9422e1 (commit)
       via  2dcb1dc9ca0302288cc931403557785d3c3667cf (commit)
      from  0fb834147e8a239b1fb928d150bb1e446eee77cb (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=3478bd5a6b263e8f0ca7d715205aaf1f4d9422e1
commit 3478bd5a6b263e8f0ca7d715205aaf1f4d9422e1
Merge: 0fb8341 2dcb1dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 2 09:57:23 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 2 09:57:23 2013 -0500

    Merge topic 'xcode-folder-dedup' into next
    
    2dcb1dc Xcode: Fix duplicate target subfolders (#14133)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2dcb1dc9ca0302288cc931403557785d3c3667cf
commit 2dcb1dc9ca0302288cc931403557785d3c3667cf
Author:     Stephan Tolksdorf <st at quanttec.com>
AuthorDate: Mon Dec 2 09:09:22 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 2 09:09:22 2013 -0500

    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.

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;

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake