diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-27 18:34:40 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-11-27 18:34:40 (GMT) |
| commit | ccf23f295cb675cded7878273e932723cf411c61 (patch) | |
| tree | e03fdc1d58e5faa68316187f471ad79e86a65e73 /Source | |
| parent | 9f832033d587d4f98b6a1b70674778acd91b8146 (diff) | |
| parent | 00e96808aa3729a6b385818643249ea2130cbef1 (diff) | |
| download | CMake-ccf23f295cb675cded7878273e932723cf411c61.zip CMake-ccf23f295cb675cded7878273e932723cf411c61.tar.gz CMake-ccf23f295cb675cded7878273e932723cf411c61.tar.bz2 | |
Merge topic 'fix-13611-source-group-issues'
00e9680 CMake: source_group needs to check its own regex after its children (#13611)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmSourceGroup.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
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; } |