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 f46e7a2b986757443f97209c040f220e46391192 (commit) via 2c601c100bb1f822da923c31bb4f2c123f1b7edd (commit) via 285f0db9f4871262360b50c870aef8bdabd853e8 (commit) from 6241f395417758c989b0c9c3ca1744bc9a880be0 (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=f46e7a2b986757443f97209c040f220e46391192 commit f46e7a2b986757443f97209c040f220e46391192 Merge: 6241f39 2c601c1 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Wed Mar 7 15:17:51 2012 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Mar 7 15:17:51 2012 -0500 Merge topic 'qt4-deploy' into next 2c601c1 DeployQt4: Add path to Qt dlls on Windows. 285f0db KWSys Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c601c100bb1f822da923c31bb4f2c123f1b7edd commit 2c601c100bb1f822da923c31bb4f2c123f1b7edd Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Wed Mar 7 11:03:36 2012 -0700 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Wed Mar 7 11:43:27 2012 -0700 DeployQt4: Add path to Qt dlls on Windows. diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake index 8a5e9c5..b37695d 100644 --- a/Modules/DeployQt4.cmake +++ b/Modules/DeployQt4.cmake @@ -126,6 +126,9 @@ function(fixup_qt4_executable executable) if(QT_LIBRARY_DIR) list(APPEND dirs "${QT_LIBRARY_DIR}") endif() + if(QT_BINARY_DIR) + list(APPEND dirs "${QT_BINARY_DIR}") + endif() if(APPLE) set(qt_conf_dir "${executable}/Contents/Resources") @@ -258,6 +261,9 @@ function(install_qt4_executable executable) if(QT_LIBRARY_DIR) list(APPEND dirs "${QT_LIBRARY_DIR}") endif() + if(QT_BINARY_DIR) + list(APPEND dirs "${QT_BINARY_DIR}") + endif() if(component) set(component COMPONENT ${component}) else() ----------------------------------------------------------------------- Summary of changes: Modules/DeployQt4.cmake | 6 ++++++ Source/kwsys/kwsysDateStamp.cmake | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits