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 a2d0d66b89a11fa9a7d280d80f5ef58b87c7dfac (commit) via 467ee368402b73756ac1b662b86cd0eee95bbe07 (commit) via 4571ea6e4d0ecbf25ac7cfa63715cc931f0f17d0 (commit) via 9cfc920973b6e479e3ba30e6b89e26ddea4d892f (commit) from a476a91a749d49c8f75da0ffbc2ee1fd3f882b8c (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=a2d0d66b89a11fa9a7d280d80f5ef58b87c7dfac commit a2d0d66b89a11fa9a7d280d80f5ef58b87c7dfac Merge: a476a91 467ee36 Author: David Cole <david.c...@kitware.com> AuthorDate: Tue Nov 1 13:56:39 2011 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Nov 1 13:56:39 2011 -0400 Merge topic 'rebase-qt4-deploy-module' into next 467ee36 Check plugin variables are defined before warning. 4571ea6 Don't resolve directories; are never relative. 9cfc920 Match fixup_qt4_executable with documentation. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=467ee368402b73756ac1b662b86cd0eee95bbe07 commit 467ee368402b73756ac1b662b86cd0eee95bbe07 Author: Mike McQuaid <m...@mikemcquaid.com> AuthorDate: Fri Oct 28 17:33:21 2011 +0100 Commit: David Cole <david.c...@kitware.com> CommitDate: Tue Nov 1 13:54:35 2011 -0400 Check plugin variables are defined before warning. diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake index ef8dd1f..4bf1b6c 100644 --- a/Modules/DeployQt4.cmake +++ b/Modules/DeployQt4.cmake @@ -225,9 +225,11 @@ function(install_qt4_plugin plugin executable copy installed_plugin_path_var) else() string(TOUPPER "QT_${plugin}_PLUGIN" plugin_var) endif() - set(plugin_release "${${plugin_var}_RELEASE}") - set(plugin_debug "${${plugin_var}_DEBUG}") - if(NOT EXISTS "${plugin_release}" AND NOT EXISTS "${plugin_debug}") + set(plugin_release_var "${plugin_var}_RELEASE") + set(plugin_debug_var "${plugin_var}_DEBUG") + set(plugin_release "${${plugin_release_var}}") + set(plugin_debug "${${plugin_debug_var}}") + if(DEFINED "${plugin_release_var}" AND DEFINED "${plugin_debug_var}" AND NOT EXISTS "${plugin_release}" AND NOT EXISTS "${plugin_debug}") message(WARNING "Qt plugin \"${plugin}\" not recognized or found.") endif() install_qt4_plugin_path("${plugin_release}" "${executable}" "${copy}" "${installed_plugin_path_var}" "${plugins_dir}" "${component}" "Release|RelWithDebInfo|MinSizeRel") http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4571ea6e4d0ecbf25ac7cfa63715cc931f0f17d0 commit 4571ea6e4d0ecbf25ac7cfa63715cc931f0f17d0 Author: Mike McQuaid <m...@mikemcquaid.com> AuthorDate: Fri Oct 28 17:32:28 2011 +0100 Commit: David Cole <david.c...@kitware.com> CommitDate: Tue Nov 1 13:54:34 2011 -0400 Don't resolve directories; are never relative. diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake index 3e20d34..ef8dd1f 100644 --- a/Modules/DeployQt4.cmake +++ b/Modules/DeployQt4.cmake @@ -151,7 +151,6 @@ function(fixup_qt4_executable executable) endforeach() resolve_qt4_paths(libs "${executable_path}") - resolve_qt4_paths(dirs "${executable_path}") if(write_qt_conf) set(qt_conf_contents "[Paths]\nPlugins = ${plugins_dir}") @@ -265,7 +264,6 @@ function(install_qt4_executable executable) endforeach() resolve_qt4_paths(libs) - resolve_qt4_paths(dirs) install(CODE " INCLUDE( \"${DeployQt4_cmake_dir}/DeployQt4.cmake\" ) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cfc920973b6e479e3ba30e6b89e26ddea4d892f commit 9cfc920973b6e479e3ba30e6b89e26ddea4d892f Author: Mike McQuaid <m...@mikemcquaid.com> AuthorDate: Fri Oct 28 17:31:30 2011 +0100 Commit: David Cole <david.c...@kitware.com> CommitDate: Tue Nov 1 13:54:34 2011 -0400 Match fixup_qt4_executable with documentation. diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake index bdf8360..3e20d34 100644 --- a/Modules/DeployQt4.cmake +++ b/Modules/DeployQt4.cmake @@ -56,7 +56,7 @@ # (or <plugins_dir>) relative to <executable> and store the result in # <installed_plugin_path_var>. See documentation of INSTALL_QT4_PLUGIN_PATH. # -# INSTALL_QT4_EXECUTABLE(<executable> <qtplugins> [<libs> <dirs> <plugins_dir> <request_qt_conf>]) +# INSTALL_QT4_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf>]) # Installs Qt plugins, writes a Qt configuration file (if needed) and fixes up # a Qt4 executable using BundleUtilities so it is standalone and can be # drag-and-drop copied to another machine as long as all of the system @@ -106,7 +106,8 @@ function(resolve_qt4_paths paths_var) set(${paths_var} ${paths_resolved} PARENT_SCOPE) endfunction() -function(fixup_qt4_executable executable qtplugins) +function(fixup_qt4_executable executable) + set(qtplugins ${ARGV1}) set(libs ${ARGV2}) set(dirs ${ARGV3}) set(plugins_dir ${ARGV4}) ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits