Commit 5806f6c5 authored by Brad King's avatar Brad King
Browse files

Merge branch 'xcode-target-sort' into release

parents 55e78dbe 9e0176e2
......@@ -966,16 +966,40 @@ struct cmSourceFilePathCompare
};
//----------------------------------------------------------------------------
void
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;
}
};
//----------------------------------------------------------------------------
bool
cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
std::vector<cmXCodeObject*>&
targets)
{
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++)
{
cmTarget& cmtarget = l->second;
sortedTargets[l->first] = &l->second;
}
for(cmSortedTargets::iterator l = sortedTargets.begin();
l != sortedTargets.end(); l++)
{
cmTarget& cmtarget = *l->second;
cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
// make sure ALL_BUILD, INSTALL, etc are only done once
......@@ -992,7 +1016,12 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
if(cmtarget.GetType() == cmTarget::UTILITY ||
cmtarget.GetType() == cmTarget::GLOBAL_TARGET)
{
targets.push_back(this->CreateUtilityTarget(cmtarget));
cmXCodeObject* t = this->CreateUtilityTarget(cmtarget);
if (!t)
{
return false;
}
targets.push_back(t);
continue;
}
......@@ -1000,7 +1029,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
std::vector<cmSourceFile*> classes;
if (!cmtarget.GetConfigCommonSourceFiles(classes))
{
return;
return false;
}
std::sort(classes.begin(), classes.end(), cmSourceFilePathCompare());
......@@ -1227,6 +1256,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
targets.push_back(this->CreateXCodeTarget(cmtarget, buildPhases));
}
return true;
}
//----------------------------------------------------------------------------
......@@ -2940,7 +2970,7 @@ void cmGlobalXCodeGenerator
}
//----------------------------------------------------------------------------
void cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>&
generators)
{
......@@ -2983,7 +3013,7 @@ void cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
std::vector<cmSourceFile*> classes;
if (!cmtarget.GetConfigCommonSourceFiles(classes))
{
return;
return false;
}
// Put cmSourceFile instances in proper groups:
for(std::vector<cmSourceFile*>::const_iterator s = classes.begin();
......@@ -3016,6 +3046,7 @@ void cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
}
}
}
return true;
}
cmXCodeObject *cmGlobalXCodeGenerator
......@@ -3136,7 +3167,7 @@ cmXCodeObject* cmGlobalXCodeGenerator
}
//----------------------------------------------------------------------------
void cmGlobalXCodeGenerator
bool cmGlobalXCodeGenerator
::CreateXCodeObjects(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>&
generators)
......@@ -3217,7 +3248,10 @@ void cmGlobalXCodeGenerator
this->MainGroupChildren->AddObject(resourcesGroup);
// now create the cmake groups
this->CreateGroups(root, generators);
if (!this->CreateGroups(root, generators))
{
return false;
}
cmXCodeObject* productGroup = this->CreateObject(cmXCodeObject::PBXGroup);
productGroup->AddAttribute("name", this->CreateString("Products"));
......@@ -3417,7 +3451,10 @@ void cmGlobalXCodeGenerator
{
if(!this->IsExcluded(root, *i))
{
this->CreateXCodeTargets(*i, targets);
if (!this->CreateXCodeTargets(*i, targets))
{
return false;
}
}
}
// loop over all targets and add link and depend info
......@@ -3446,6 +3483,7 @@ void cmGlobalXCodeGenerator
}
}
this->RootObject->AddAttribute("targets", allTargets);
return true;
}
//----------------------------------------------------------------------------
......@@ -3632,8 +3670,10 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
}
}
this->CreateXCodeObjects(root,
generators);
if (!this->CreateXCodeObjects(root, generators))
{
return;
}
std::string xcodeDir = root->GetMakefile()->GetStartOutputDirectory();
xcodeDir += "/";
xcodeDir += root->GetMakefile()->GetProjectName();
......
......@@ -91,7 +91,7 @@ private:
cmSourceGroup* sg);
cmXCodeObject* CreatePBXGroup(cmXCodeObject *parent,
std::string name);
void CreateGroups(cmLocalGenerator* root,
bool CreateGroups(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>&
generators);
std::string XCodeEscapePath(const char* p);
......@@ -151,7 +151,7 @@ private:
std::string ExtractFlag(const char* flag, std::string& flags);
// delete all objects in the this->XCodeObjects vector.
void ClearXCodeObjects();
void CreateXCodeObjects(cmLocalGenerator* root,
bool CreateXCodeObjects(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators);
void OutputXCodeProject(cmLocalGenerator* root,
std::vector<cmLocalGenerator*>& generators);
......@@ -170,7 +170,7 @@ private:
cmXCodeObject* CreateXCodeSourceFile(cmLocalGenerator* gen,
cmSourceFile* sf,
cmTarget& cmtarget);
void CreateXCodeTargets(cmLocalGenerator* gen,
bool CreateXCodeTargets(cmLocalGenerator* gen,
std::vector<cmXCodeObject*>&);
bool IsHeaderFile(cmSourceFile*);
void AddDependTarget(cmXCodeObject* target,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment