From 172297adfda6e354b117c145a9050dd46e31d1f0 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Wed, 31 Jan 2007 20:02:04 +0000
Subject: -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
---
 modules/FindQt4.cmake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules')

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}
-- 
cgit v1.2.1