[Cmake-commits] CMake branch, next, updated. v2.8.9-127-gdbb747a

[Alexander Neundorf]

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  dbb747aad856fc914236429edaa2881b62048dab (commit)
       via  a3815e67cf9ff7f542e809d8974b695893a6a783 (commit)
      from  027d2d9dd0f4c15a8a79c1a11b9c510ddb257d8a (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=dbb747aad856fc914236429edaa2881b62048dab
commit dbb747aad856fc914236429edaa2881b62048dab
Merge: 027d2d9 a3815e6
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Thu Aug 16 17:38:01 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 16 17:38:01 2012 -0400

    Merge topic 'HandleMacFrameworkIncludeDirs_13465' into next
    
    a3815e6 -fix line length


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3815e67cf9ff7f542e809d8974b695893a6a783
commit a3815e67cf9ff7f542e809d8974b695893a6a783
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Aug 16 23:37:15 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Aug 16 23:37:15 2012 +0200

    -fix line length
    
    Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 99ca375..bb650eb 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -614,10 +614,10 @@ void cmExtraEclipseCDT4Generator::AppendIncludeDirectories(
       // handle framework include dirs on OSX, the remainder after the
       // Frameworks/ part has to be stripped
       //   /System/Library/Frameworks/GLUT.framework/Headers
-      cmsys::RegularExpression frameworkRegex("(.+/Frameworks)/.+\\.framework/");
-      if(frameworkRegex.find(dir.c_str()))
+      cmsys::RegularExpression frameworkRx("(.+/Frameworks)/.+\\.framework/");
+      if(frameworkRx.find(dir.c_str()))
         {
-        dir = frameworkRegex.match(1);
+        dir = frameworkRx.match(1);
         }
 
       if(emittedDirs.find(dir) == emittedDirs.end())

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

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake