kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'xcode-organize-sources'

Browse Source 
f6a8983 Xcode: Sort source files
0816cae Xcode: Fix nested source group handling (#12943)
This commit is contained in:
Brad King 2013-02-20 08:09:17 -05:00 committed by CMake Topic Stage
commit 414658f057
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmGlobalXCodeGenerator.cxx
View File

@ -955,6 +955,15 @@ void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen)
} }
} }
//----------------------------------------------------------------------------
struct cmSourceFilePathCompare
{
bool operator()(cmSourceFile* l, cmSourceFile* r)
{
return l->GetFullPath() < r->GetFullPath();
}
};
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void void
cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen, cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
@ -981,7 +990,9 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
} }
// organize the sources // organize the sources
std::vector<cmSourceFile*> const &classes = cmtarget.GetSourceFiles(); std::vector<cmSourceFile*> classes = cmtarget.GetSourceFiles();
std::sort(classes.begin(), classes.end(), cmSourceFilePathCompare());
std::vector<cmXCodeObject*> externalObjFiles; std::vector<cmXCodeObject*> externalObjFiles;
std::vector<cmXCodeObject*> headerFiles; std::vector<cmXCodeObject*> headerFiles;
std::vector<cmXCodeObject*> resourceFiles; std::vector<cmXCodeObject*> resourceFiles;
@ -2914,7 +2925,7 @@ cmXCodeObject* cmGlobalXCodeGenerator
{ {
std::vector<std::string> folders = std::vector<std::string> folders =
cmSystemTools::tokenize(sg->GetFullName(), "\\"); cmSystemTools::tokenize(sg->GetFullName(), "\\");
cmStdString curr_folder = cmtarget.GetName(); cmStdString curr_folder = target;
curr_folder += "/"; curr_folder += "/";
for(std::vector<std::string>::size_type i = 0; i < folders.size();i++) for(std::vector<std::string>::size_type i = 0; i < folders.size();i++)
{ {