Merge topic 'sort-xcode-folders'

4ca5e5480a Xcode: Order targets alphabetically

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11289

Source/cmGlobalXCodeGenerator.cxx

@@ -4551,6 +4551,21 @@ bool cmGlobalXCodeGenerator::CreateGroups(
       }
     }
   }
+
+  // Sort all children of each target group by name alphabetically.
+  auto const getName = [](cmXCodeObject* obj) -> cm::string_view {
+    cmXCodeObject* name = obj->GetAttribute("name");
+    return name ? name->GetString() : cm::string_view{ ""_s };
+  };
+  for (auto& group : this->TargetGroup) {
+    if (cmXCodeObject* children = group.second->GetAttribute("children")) {
+      children->SortObjectList(getName);
+    }
+  }
+  // Also sort the-top level group.  Special groups like Products,
+  // Frameworks, and Resources are added later to the end of the list.
+  this->MainGroupChildren->SortObjectList(getName);
+
   return true;
 }
 

Source/cmXCodeObject.h

@@ -163,6 +163,15 @@ public:
   void SetComment(std::string const& c) { this->Comment = c; }
   static void PrintString(std::ostream& os, std::string const& String);
 
+  template <typename Proj>
+  void SortObjectList(Proj projector)
+  {
+    std::sort(this->List.begin(), this->List.end(),
+              [&projector](cmXCodeObject* a, cmXCodeObject* b) {
+                return projector(a) < projector(b);
+              });
+  }
+
 protected:
   void PrintString(std::ostream& os) const;