This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 1732a497c138c358229cde071a333c0ff645ab57 (commit) via f6a8983db4b67cde32b9ea88c91c65bb1ef82d6c (commit) via 0816caecac5b9e4b93ce17301e0aad2c7a9845e8 (commit) from bc6d5853c67bcfb64cf0ac6b75ec5a8f27a7d428 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1732a497c138c358229cde071a333c0ff645ab57 commit 1732a497c138c358229cde071a333c0ff645ab57 Merge: bc6d585 f6a8983 Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Feb 18 11:09:08 2013 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Feb 18 11:09:08 2013 -0500 Merge topic 'xcode-organize-sources' into next f6a8983 Xcode: Sort source files 0816cae Xcode: Fix nested source group handling (#12943) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6a8983db4b67cde32b9ea88c91c65bb1ef82d6c commit f6a8983db4b67cde32b9ea88c91c65bb1ef82d6c Author: Alexander Chehovsky <madfishthe...@gmail.com> AuthorDate: Sat Feb 16 14:23:21 2013 +0100 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon Feb 18 08:47:14 2013 -0500 Xcode: Sort source files Since Xcode doesn't sort the files on its own, let's sort them in our generator to make navigation easier. Visual Studio, QtCreator, and kdevelop all display files sorted. diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index cca5931..7cc1287 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -956,6 +956,15 @@ void cmGlobalXCodeGenerator::SetCurrentLocalGenerator(cmLocalGenerator* gen) } //---------------------------------------------------------------------------- +struct cmSourceFilePathCompare +{ + bool operator()(cmSourceFile* l, cmSourceFile* r) + { + return l->GetFullPath() < r->GetFullPath(); + } +}; + +//---------------------------------------------------------------------------- void cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen, std::vector<cmXCodeObject*>& @@ -981,7 +990,9 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen, } // 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*> headerFiles; std::vector<cmXCodeObject*> resourceFiles; http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0816caecac5b9e4b93ce17301e0aad2c7a9845e8 commit 0816caecac5b9e4b93ce17301e0aad2c7a9845e8 Author: Alexander Chehovsky <madfishthe...@gmail.com> AuthorDate: Sat Feb 16 14:23:20 2013 +0100 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon Feb 18 08:47:10 2013 -0500 Xcode: Fix nested source group handling (#12943) Teach the code path for nested sources build the group map key in the same way as non-nested code path does. diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 9600771..cca5931 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2914,7 +2914,7 @@ cmXCodeObject* cmGlobalXCodeGenerator { std::vector<std::string> folders = cmSystemTools::tokenize(sg->GetFullName(), "\\"); - cmStdString curr_folder = cmtarget.GetName(); + cmStdString curr_folder = target; curr_folder += "/"; for(std::vector<std::string>::size_type i = 0; i < folders.size();i++) { ----------------------------------------------------------------------- Summary of changes: Source/cmGlobalXCodeGenerator.cxx | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits