BUG: finally fix #4331, the previous version just caught the tag, the

filename not at all

Alex
This commit is contained in:
Alexander Neundorf 2007-01-31 15:06:07 -05:00
parent d48bf5c3b6
commit 94550852eb
1 changed files with 2 additions and 2 deletions

View File

@ -868,10 +868,10 @@ IF (QT4_QMAKE_FOUND)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx) SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx)
# parse file for dependencies # parse file for dependencies
FILE(READ "${infile}" _RC_FILE_CONTENTS) 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) SET(_RC_DEPENDS)
FOREACH(_RC_FILE ${_RC_FILES}) 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}") SET(_RC_DEPENDS ${_RC_DEPENDS} "${rc_path}/${_RC_FILE}")
ENDFOREACH(_RC_FILE) ENDFOREACH(_RC_FILE)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile} ADD_CUSTOM_COMMAND(OUTPUT ${outfile}