diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-01-31 20:02:04 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-01-31 20:02:04 +0000 |
| commit | 172297adfda6e354b117c145a9050dd46e31d1f0 (patch) | |
| tree | 7976440a59af91aa2410acfe428cb4fb6a2c21b3 /modules | |
| parent | 10a8dd9694b3c953ba09c485dff4142daf1a5a62 (diff) | |
| download | extra-cmake-modules-172297adfda6e354b117c145a9050dd46e31d1f0.tar.gz extra-cmake-modules-172297adfda6e354b117c145a9050dd46e31d1f0.tar.bz2 | |
-fix parsing of qrc files, the file tag can have attributes
http://www.cmake.org/Bug/bug.php?op=show&bugid=4331
Alex
svn path=/trunk/KDE/kdelibs/; revision=628882
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindQt4.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 8f3be9c8..8ee24be1 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -850,10 +850,11 @@ 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} |