[cmake-commits] hoffman committed FindQt4.cmake 1.61 1.62
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Jan 19 11:55:42 EST 2007
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv29133
Modified Files:
FindQt4.cmake
Log Message:
BUG: fix for bug 4331
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- FindQt4.cmake 19 Jan 2007 01:35:07 -0000 1.61
+++ FindQt4.cmake 19 Jan 2007 16:55:39 -0000 1.62
@@ -868,10 +868,10 @@
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}
More information about the Cmake-commits
mailing list