cmGlobalGenerator: Call AddExtraIDETargets as a hook of Compute().

Relieve the Xcode generator of having to reimplement Compute().
This commit is contained in:
Stephen Kelly 2015-09-15 20:37:57 +02:00
parent a09c545d3a
commit 4407eee013
4 changed files with 4 additions and 13 deletions

View File

@ -1282,6 +1282,8 @@ bool cmGlobalGenerator::Compute()
} }
} }
this->AddExtraIDETargets();
return true; return true;
} }

View File

@ -84,6 +84,7 @@ public:
virtual void Configure(); virtual void Configure();
virtual bool Compute(); virtual bool Compute();
virtual void AddExtraIDETargets() {}
enum TargetTypes { enum TargetTypes {
AllTargets, AllTargets,

View File

@ -376,17 +376,6 @@ cmGlobalXCodeGenerator::CreateLocalGenerator(cmMakefile* mf)
return new cmLocalXCodeGenerator(this, mf); return new cmLocalXCodeGenerator(this, mf);
} }
//----------------------------------------------------------------------------
bool cmGlobalXCodeGenerator::Compute()
{
if (!cmGlobalGenerator::Compute())
{
return false;
}
this->AddExtraIDETargets();
return true;
}
void cmGlobalXCodeGenerator::AddExtraIDETargets() void cmGlobalXCodeGenerator::AddExtraIDETargets()
{ {
std::map<std::string, std::vector<cmLocalGenerator*> >::iterator it; std::map<std::string, std::vector<cmLocalGenerator*> >::iterator it;

View File

@ -87,8 +87,7 @@ public:
virtual bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf); virtual bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf);
void AppendFlag(std::string& flags, std::string const& flag); void AppendFlag(std::string& flags, std::string const& flag);
protected: protected:
virtual bool Compute(); virtual void AddExtraIDETargets();
void AddExtraIDETargets();
virtual void Generate(); virtual void Generate();
private: private:
cmXCodeObject* CreateOrGetPBXGroup(cmTarget& cmtarget, cmXCodeObject* CreateOrGetPBXGroup(cmTarget& cmtarget,