[Cmake-commits] CMake branch, next, updated. v2.8.9-300-gf152107

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f152107cd906e9bbe484830e25658e4e833be895 (commit)
       via  42bfc5a3e4dd495db96b0ad9f0e4e1bef4ecfa51 (commit)
      from  593ef91a51c2ccb6e3c38f7bd1d2cba11ba963d5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f152107cd906e9bbe484830e25658e4e833be895
commit f152107cd906e9bbe484830e25658e4e833be895
Merge: 593ef91 42bfc5a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 30 03:50:28 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 30 03:50:28 2012 -0400

    Merge topic 'Qt4Macros-fix-resource-parsing' into next
    
    42bfc5a Read entire Qt4 qrc file when parsing for depends info.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42bfc5a3e4dd495db96b0ad9f0e4e1bef4ecfa51
commit 42bfc5a3e4dd495db96b0ad9f0e4e1bef4ecfa51
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 30 09:47:42 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 30 09:47:42 2012 +0200

    Read entire Qt4 qrc file when parsing for depends info.
    
    The qrc file is an xml file, not line based, so the entire 'interesting'
    content to parse is not necessarily found by STRINGS and a regexp.

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 6cf16fd..b52dde8 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}")

-----------------------------------------------------------------------

Summary of changes:
 Modules/Qt4Macros.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake