[Cmake-commits] CMake branch, next, updated. v3.1.0-2125-gc8dbde2

[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  c8dbde2a28d518a59867d116ebf93ed4a8704a1e (commit)
       via  aec4a3fa6c2185a166377a27f08aa6a7aea8f13a (commit)
      from  bc08c11db52548e4ccac239d3204b83256f3fba2 (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=c8dbde2a28d518a59867d116ebf93ed4a8704a1e
commit c8dbde2a28d518a59867d116ebf93ed4a8704a1e
Merge: bc08c11 aec4a3f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 18 11:25:56 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 18 11:25:56 2015 -0500

    Merge topic 'xcode-target-sort' into next
    
    aec4a3fa Revert "cmGlobalXCodeGenerator: sort targets"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aec4a3fa6c2185a166377a27f08aa6a7aea8f13a
commit aec4a3fa6c2185a166377a27f08aa6a7aea8f13a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sun Jan 18 11:19:55 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sun Jan 18 11:19:55 2015 -0500

    Revert "cmGlobalXCodeGenerator: sort targets"
    
    This reverts commit a7cb6054223c6717c1c49378bd7446e12a5000b5.
    This somehow causes the RunCMake.TargetSources test to crash
    and will need further investigation.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 0899614..13e6988 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -966,23 +966,6 @@ struct cmSourceFilePathCompare
 };
 
 //----------------------------------------------------------------------------
-struct cmCompareTargets
-{
-  bool operator () (std::string const& a, std::string const& b) const
-  {
-    if (a == "ALL_BUILD")
-      {
-      return true;
-      }
-    if (b == "ALL_BUILD")
-      {
-      return false;
-      }
-    return strcmp(a.c_str(), b.c_str()) < 0;
-  }
-};
-
-//----------------------------------------------------------------------------
 void
 cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
                                            std::vector<cmXCodeObject*>&
@@ -990,16 +973,9 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
 {
   this->SetCurrentLocalGenerator(gen);
   cmTargets &tgts = this->CurrentMakefile->GetTargets();
-  typedef std::map<std::string, cmTarget*, cmCompareTargets> cmSortedTargets;
-  cmSortedTargets sortedTargets;
   for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
     {
-    sortedTargets[l->first] = &l->second;
-    }
-  for(cmSortedTargets::iterator l = sortedTargets.begin();
-      l != sortedTargets.end(); l++)
-    {
-    cmTarget& cmtarget = *l->second;
+    cmTarget& cmtarget = l->second;
     cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
 
     // make sure ALL_BUILD, INSTALL, etc are only done once

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

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |   26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)


hooks/post-receive
-- 
CMake