From 96374202259addc6a4cf52cb867094275d9621a6 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Tue, 30 Jan 2007 23:02:59 +0000
Subject: -sync with cmake cvs: better parsing of the rc files

Alex

svn path=/trunk/KDE/kdelibs/; revision=628695
---
 modules/FindQt4.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake
index 8f3be9c8..fe2f0144 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}
-- 
cgit v1.2.1