diff options
| author | David Cole <david.cole@kitware.com> | 2010-11-23 21:11:15 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-11-23 21:11:15 (GMT) |
| commit | 88281035bd856ef0d5cd6abb1079b24dd8aa6124 (patch) | |
| tree | efeaee5d61a6de0f22c78c61a44fe4811f9a59d9 /Modules | |
| parent | 40cb8a2373d1805e10ce1b0a4702bfb3365ad994 (diff) | |
| parent | 35b91ac5c0d781bcea5d013bcd62fa11c6841d6f (diff) | |
| download | CMake-88281035bd856ef0d5cd6abb1079b24dd8aa6124.zip CMake-88281035bd856ef0d5cd6abb1079b24dd8aa6124.tar.gz CMake-88281035bd856ef0d5cd6abb1079b24dd8aa6124.tar.bz2 | |
Merge topic 'moc-includes-regex'
35b91ac Fix regex for moc includes when looking for frameworks.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Qt4Macros.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake index df07d25..6a609a0 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) |