[Cmake-commits] CMake branch, next, updated. v2.8.8-3388-g334ae70

[Clinton Stimpson]

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  334ae7044d368bba84d65fc8fc9e1231f5671b89 (commit)
       via  374b9b9e74490a5734000b5e224c8d2c3d40630b (commit)
      from  575ecd0e6db791450a472817bd05542b5bf411c7 (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=334ae7044d368bba84d65fc8fc9e1231f5671b89
commit 334ae7044d368bba84d65fc8fc9e1231f5671b89
Merge: 575ecd0 374b9b9
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Jul 9 12:18:05 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 9 12:18:05 2012 -0400

    Merge topic 'deploy-qt4-workaround-bug-13258' into next
    
    374b9b9 DeployQt4: workaround bug 13258 where ARGV1 is leaked into a sub function.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=374b9b9e74490a5734000b5e224c8d2c3d40630b
commit 374b9b9e74490a5734000b5e224c8d2c3d40630b
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Jul 9 10:18:45 2012 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Jul 9 10:18:45 2012 -0600

    DeployQt4: workaround bug 13258 where ARGV1 is leaked into a sub function.

diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake
index b37695d..edf4b4e 100644
--- a/Modules/DeployQt4.cmake
+++ b/Modules/DeployQt4.cmake
@@ -290,7 +290,7 @@ function(install_qt4_executable executable)
                 endforeach()
         endif()
 
-        resolve_qt4_paths(libs)
+        resolve_qt4_paths(libs "")
 
         install(CODE
   "INCLUDE(\"${DeployQt4_cmake_dir}/DeployQt4.cmake\")

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

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


hooks/post-receive
-- 
CMake