[Cmake-commits] CMake branch, next, updated. v2.8.4-1713-geb44075

[Brad King]

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  eb44075c4f67af0a1fb4c98c2b8bbcde21665305 (commit)
       via  f09ba0f1a2dbae3bca99b35b7d8c26c457c5824c (commit)
      from  e2276488ae6a37b1597bcf92a37fb02992de93bd (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=eb44075c4f67af0a1fb4c98c2b8bbcde21665305
commit eb44075c4f67af0a1fb4c98c2b8bbcde21665305
Merge: e227648 f09ba0f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 8 07:57:01 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 8 07:57:01 2011 -0400

    Merge topic 'xcode-source_groups-folders-issue-10039' into next
    
    f09ba0f Fix style errors added by parent and grandparent


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f09ba0f1a2dbae3bca99b35b7d8c26c457c5824c
commit f09ba0f1a2dbae3bca99b35b7d8c26c457c5824c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 8 07:54:33 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 8 07:54:33 2011 -0400

    Fix style errors added by parent and grandparent

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 688296e..b0c095d 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2506,7 +2506,8 @@ cmXCodeObject* cmGlobalXCodeGenerator
     }
   else
     {
-    std::vector<std::string> tgt_folders = cmSystemTools::tokenize(target, "/");
+    std::vector<std::string> tgt_folders =
+      cmSystemTools::tokenize(target, "/");
     cmStdString curr_tgt_folder;
     for(std::vector<std::string>::size_type i = 0; i < tgt_folders.size();i++)
       {
@@ -2543,13 +2544,15 @@ cmXCodeObject* cmGlobalXCodeGenerator
   //It's a recursive folder structure, let's find the real parent group
   if(std::string(sg->GetFullName()) != std::string(sg->GetName()))
     {
-    std::vector<std::string> folders = cmSystemTools::tokenize(sg->GetFullName(), "\\");
+    std::vector<std::string> folders =
+      cmSystemTools::tokenize(sg->GetFullName(), "\\");
     cmStdString curr_folder = cmtarget.GetName();
     curr_folder += "/";
     for(std::vector<std::string>::size_type i = 0; i < folders.size();i++)
       {
       curr_folder += folders[i];
-      std::map<cmStdString, cmXCodeObject* >::iterator i_folder = this->GroupNameMap.find(curr_folder);
+      std::map<cmStdString, cmXCodeObject* >::iterator i_folder =
+        this->GroupNameMap.find(curr_folder);
       //Create new folder
       if(i_folder == this->GroupNameMap.end())
         {
diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index 22f4d47..8e61d0a 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -27,7 +27,8 @@ bool cmSourceGroupCommand
     delimiter = this->Makefile->GetDefinition("SOURCE_GROUP_DELIMITER");
     }
 
-  std::vector<std::string> folders = cmSystemTools::tokenize(args[0], delimiter);
+  std::vector<std::string> folders =
+    cmSystemTools::tokenize(args[0], delimiter);
  
   cmSourceGroup* sg = 0;
   sg = this->Makefile->GetSourceGroup(folders);

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    9 ++++++---
 Source/cmSourceGroupCommand.cxx   |    3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake