diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-01-31 20:06:07 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-01-31 20:06:07 (GMT) |
| commit | 94550852ebbe63ea4be3f34521f7095e8ec26660 (patch) | |
| tree | cdc3a9a8e382e50dcdf4ba6a7572a2427be8f112 /Modules | |
| parent | d48bf5c3b6b6d1f26bf2372088e64d4dc4197677 (diff) | |
| download | CMake-94550852ebbe63ea4be3f34521f7095e8ec26660.zip CMake-94550852ebbe63ea4be3f34521f7095e8ec26660.tar.gz CMake-94550852ebbe63ea4be3f34521f7095e8ec26660.tar.bz2 | |
BUG: finally fix #4331, the previous version just caught the tag, the
filename not at all
Alex
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 632ec7b..cecdac8 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -868,10 +868,10 @@ IF (QT4_QMAKE_FOUND) SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx) # parse file for dependencies FILE(READ "${infile}" _RC_FILE_CONTENTS) - STRING(REGEX MATCHALL "<file[^<]*>" _RC_FILES "${_RC_FILE_CONTENTS}") + STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}") SET(_RC_DEPENDS) FOREACH(_RC_FILE ${_RC_FILES}) - STRING(REGEX REPLACE "^<file[^<]*>" "" _RC_FILE "${_RC_FILE}") + STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}") SET(_RC_DEPENDS ${_RC_DEPENDS} "${rc_path}/${_RC_FILE}") ENDFOREACH(_RC_FILE) ADD_CUSTOM_COMMAND(OUTPUT ${outfile} |