[Cmake-commits] CMake branch, next, updated. v2.8.2-325-g423218b

[Clinton Stimpson]

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  423218b14cca3d8d85757443d53c7b2eceebbe64 (commit)
       via  35b91ac5c0d781bcea5d013bcd62fa11c6841d6f (commit)
       via  de8cc71e13334bf6193db142754e8a01d8a1c36e (commit)
       via  afd32fbded8655fd86d5f00de9fcc323fdc9096f (commit)
      from  de9ec5c0f955967405db820f97821707ea35f5e8 (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=423218b14cca3d8d85757443d53c7b2eceebbe64
commit 423218b14cca3d8d85757443d53c7b2eceebbe64
Merge: de9ec5c 35b91ac
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Aug 2 09:39:49 2010 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Aug 2 09:39:49 2010 -0600

    Merge branch 'moc-includes-regex' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=35b91ac5c0d781bcea5d013bcd62fa11c6841d6f
commit 35b91ac5c0d781bcea5d013bcd62fa11c6841d6f
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Aug 2 09:39:02 2010 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Aug 2 09:39:02 2010 -0600

    Fix regex for moc includes when looking for frameworks.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index bd72c8f..8553feb 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -71,12 +71,12 @@ MACRO (QT4_GET_MOC_FLAGS _moc_flags)
   GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
 
   FOREACH(_current ${_inc_DIRS})
-    IF("${_current}" MATCHES ".framework/?$")
-      STRING(REGEX REPLACE "/[^/]+.framework" "" framework_path "${_current}")
+    IF("${_current}" MATCHES "\\.framework/?$")
+      STRING(REGEX REPLACE "/[^/]+\\.framework" "" framework_path "${_current}")
       SET(${_moc_flags} ${${_moc_flags}} "-F${framework_path}")
-    ELSE("${_current}" MATCHES ".framework/?$")
+    ELSE("${_current}" MATCHES "\\.framework/?$")
       SET(${_moc_flags} ${${_moc_flags}} "-I${_current}")
-    ENDIF("${_current}" MATCHES ".framework/?$")
+    ENDIF("${_current}" MATCHES "\\.framework/?$")
   ENDFOREACH(_current ${_inc_DIRS})
 
   GET_DIRECTORY_PROPERTY(_defines COMPILE_DEFINITIONS)

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

Summary of changes:
 Modules/Qt4Macros.cmake           |    8 ++++----
 Source/kwsys/kwsysDateStamp.cmake |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake