[Cmake-commits] CMake branch, next, updated. v2.8.10.1-992-g7e9d5db

[David Cole]

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  7e9d5dbbfe49d2fe58633db8028aa68653d9e728 (commit)
       via  00e96808aa3729a6b385818643249ea2130cbef1 (commit)
       via  0499f93716602ba906e292f279e215f4a8e92a01 (commit)
       via  976cfddae8b43fcf6f8c1611a1da2d9a4e31a359 (commit)
      from  d23cc6ee8bc2dd156b1ae69b7e988eb6017d2b7a (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=7e9d5dbbfe49d2fe58633db8028aa68653d9e728
commit 7e9d5dbbfe49d2fe58633db8028aa68653d9e728
Merge: d23cc6e 00e9680
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Nov 23 11:08:21 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 23 11:08:21 2012 -0500

    Merge topic 'fix-13611-source-group-issues' into next
    
    00e9680 CMake: source_group needs to check its own regex after its children (#13611)
    0499f93 CMake Nightly Date Stamp
    976cfdd CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00e96808aa3729a6b385818643249ea2130cbef1
commit 00e96808aa3729a6b385818643249ea2130cbef1
Author:     Clemens Heppner <ch at cheppner.de>
AuthorDate: Sun Oct 28 09:54:26 2012 +0100
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Nov 23 10:57:13 2012 -0500

    CMake: source_group needs to check its own regex after its children (#13611)
    
    Otherwise, regexes that descend into sub-folders do not get grouped correctly.

diff --git a/Source/cmSourceGroup.cxx b/Source/cmSourceGroup.cxx
index 4fd9851..f09976f 100644
--- a/Source/cmSourceGroup.cxx
+++ b/Source/cmSourceGroup.cxx
@@ -182,10 +182,6 @@ cmSourceGroup *cmSourceGroup::MatchChildrenRegex(const char *name)
   std::vector<cmSourceGroup>::iterator end =
     this->Internal->GroupChildren.end();
 
-  if(this->MatchesRegex(name))
-    {
-    return this;
-    }
   for(;iter!=end; ++iter)
     {
     cmSourceGroup *result = iter->MatchChildrenRegex(name);
@@ -194,6 +190,11 @@ cmSourceGroup *cmSourceGroup::MatchChildrenRegex(const char *name)
       return result;
       }
     }
+  if(this->MatchesRegex(name))
+    {
+    return this;
+    }
+
   return 0;
 }
 

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

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 Source/cmSourceGroup.cxx  |    9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake