[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2007-01-31 20:02:10
Message-ID: 1170273730.576146.29113.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 628882 by neundorf:

-fix parsing of qrc files, the file tag can have attributes
http://www.cmake.org/Bug/bug.php?op=show&bugid=4331

Alex



 M  +3 -2      FindQt4.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindQt4.cmake #628881:628882
@@ -850,10 +850,11 @@
       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}
[prev in list] [next in list] [prev in thread] [next in thread]