diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2007-01-31 19:18:27 +0000 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2007-01-31 19:18:27 +0000 |
| commit | 10a8dd9694b3c953ba09c485dff4142daf1a5a62 (patch) | |
| tree | 847535048fb691025b8e215807fb082fa19240bc | |
| parent | 96374202259addc6a4cf52cb867094275d9621a6 (diff) | |
| download | extra-cmake-modules-10a8dd9694b3c953ba09c485dff4142daf1a5a62.tar.gz extra-cmake-modules-10a8dd9694b3c953ba09c485dff4142daf1a5a62.tar.bz2 | |
QT4_ADD_RESOURCES from cmake 2.4.6 to fix kjscmd.qrc parsing
why does it work on linux?
svn path=/trunk/KDE/kdelibs/; revision=628868
| -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 fe2f0144..8f3be9c8 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -850,10 +850,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} |