diff options
| author | David Cole <david.cole@kitware.com> | 2012-09-04 19:47:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-09-04 19:47:33 (GMT) |
| commit | 1f2694f52ecfceaba004fbf336eded4a76e42091 (patch) | |
| tree | 04f6a76010e0f20a46e0aad48cfc2c3b3b4c654c /Modules/Qt4Macros.cmake | |
| parent | 508ed6940b447c2fb6b5fe4f036138ce57ab3c4c (diff) | |
| parent | 42bfc5a3e4dd495db96b0ad9f0e4e1bef4ecfa51 (diff) | |
| download | CMake-1f2694f52ecfceaba004fbf336eded4a76e42091.zip CMake-1f2694f52ecfceaba004fbf336eded4a76e42091.tar.gz CMake-1f2694f52ecfceaba004fbf336eded4a76e42091.tar.bz2 | |
Merge topic 'Qt4Macros-fix-resource-parsing'
42bfc5a Read entire Qt4 qrc file when parsing for depends info.
Diffstat (limited to 'Modules/Qt4Macros.cmake')
| -rw-r--r-- | Modules/Qt4Macros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake index 8e8680c..251d57c 100644 --- a/Modules/Qt4Macros.cmake +++ b/Modules/Qt4Macros.cmake @@ -187,7 +187,7 @@ macro (QT4_ADD_RESOURCES outfiles ) if(EXISTS "${infile}") # parse file for dependencies # all files are absolute paths or relative to the location of the qrc file - file(STRINGS "${infile}" _RC_FILE_CONTENTS REGEX "<file[^>]*>[^<]+") + file(READ "${infile}" _RC_FILE_CONTENTS) string(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}") foreach(_RC_FILE ${_RC_FILES}) string(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}") |