From 4407eee01365d89d370d8e8b89f3ec0a65420046 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Tue, 15 Sep 2015 20:37:57 +0200
Subject: cmGlobalGenerator: Call AddExtraIDETargets as a hook of Compute().

Relieve the Xcode generator of having to reimplement Compute().
---
 Source/cmGlobalGenerator.cxx      |  2 ++
 Source/cmGlobalGenerator.h        |  1 +
 Source/cmGlobalXCodeGenerator.cxx | 11 -----------
 Source/cmGlobalXCodeGenerator.h   |  3 +--
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 4a48b5d..27f860e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1282,6 +1282,8 @@ bool cmGlobalGenerator::Compute()
       }
     }
 
+  this->AddExtraIDETargets();
+
   return true;
 }
 
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index ba74c9e..e73aac2 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -84,6 +84,7 @@ public:
   virtual void Configure();
 
   virtual bool Compute();
+  virtual void AddExtraIDETargets() {}
 
   enum TargetTypes {
     AllTargets,
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index e209b64..746e1a7 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -376,17 +376,6 @@ cmGlobalXCodeGenerator::CreateLocalGenerator(cmMakefile* mf)
   return new cmLocalXCodeGenerator(this, mf);
 }
 
-//----------------------------------------------------------------------------
-bool cmGlobalXCodeGenerator::Compute()
-{
-  if (!cmGlobalGenerator::Compute())
-    {
-      return false;
-    }
-  this->AddExtraIDETargets();
-  return true;
-}
-
 void cmGlobalXCodeGenerator::AddExtraIDETargets()
 {
   std::map<std::string, std::vector<cmLocalGenerator*> >::iterator it;
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 413a7bc..9daf0ab 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -87,8 +87,7 @@ public:
   virtual bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf);
   void AppendFlag(std::string& flags, std::string const& flag);
 protected:
-  virtual bool Compute();
-  void AddExtraIDETargets();
+  virtual void AddExtraIDETargets();
   virtual void Generate();
 private:
   cmXCodeObject* CreateOrGetPBXGroup(cmTarget& cmtarget,
-- 
cgit v0.12