[Cmake-commits] CMake branch, next, updated. v2.8.6-1726-g76d76f4
Clinton Stimpson
clinton at elemtech.com
Mon Oct 31 10:05:49 EDT 2011
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 76d76f425f82daeb7450237ee2c47d4141e519d9 (commit)
via 3ebf9ed39bac5736b53bd455e2f5cdca381acaf9 (commit)
via e90849aed23c3673c3dc44b1573e2ee84ff02eda (commit)
via d481477962c6fd481bbcd4044011d7147c2f2837 (commit)
via becc5eeda23dd809134af5fe876be05400e9fa33 (commit)
via 07e88ae4499b632222367eb5b4308cac2a89718f (commit)
via 3313cdeb3321d385b6d84bd5b0784337243316a1 (commit)
from 4f2b45203247a27c91f5d16f591cc4491a6ad0d4 (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=76d76f425f82daeb7450237ee2c47d4141e519d9
commit 76d76f425f82daeb7450237ee2c47d4141e519d9
Merge: 4f2b452 3ebf9ed
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Oct 31 10:05:37 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 31 10:05:37 2011 -0400
Merge topic 'qt4-deploy-module' into next
3ebf9ed Check plugin variables are defined before warning.
e90849a Don't resolve directories; are never relative.
d481477 Match fixup_qt4_executable with documentation.
becc5ee Merge branch 'master' of CMakeGit:cmake
07e88ae KWSys Nightly Date Stamp
3313cde Merge branch 'CodeBlocks-quoting'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3ebf9ed39bac5736b53bd455e2f5cdca381acaf9
commit 3ebf9ed39bac5736b53bd455e2f5cdca381acaf9
Author: Mike McQuaid <mike at mikemcquaid.com>
AuthorDate: Fri Oct 28 17:33:21 2011 +0100
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Oct 31 08:04:11 2011 -0600
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=e90849aed23c3673c3dc44b1573e2ee84ff02eda
commit e90849aed23c3673c3dc44b1573e2ee84ff02eda
Author: Mike McQuaid <mike at mikemcquaid.com>
AuthorDate: Fri Oct 28 17:32:28 2011 +0100
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Oct 31 08:04:11 2011 -0600
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=d481477962c6fd481bbcd4044011d7147c2f2837
commit d481477962c6fd481bbcd4044011d7147c2f2837
Author: Mike McQuaid <mike at mikemcquaid.com>
AuthorDate: Fri Oct 28 17:31:30 2011 +0100
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Oct 31 08:04:11 2011 -0600
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})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=becc5eeda23dd809134af5fe876be05400e9fa33
commit becc5eeda23dd809134af5fe876be05400e9fa33
Merge: 3313cde 07e88ae
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Oct 31 07:59:51 2011 -0600
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Oct 31 07:59:51 2011 -0600
Merge branch 'master' of CMakeGit:cmake
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3313cdeb3321d385b6d84bd5b0784337243316a1
commit 3313cdeb3321d385b6d84bd5b0784337243316a1
Merge: ab97790 240d39a
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Oct 5 10:09:12 2011 -0600
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Oct 5 10:09:12 2011 -0600
Merge branch 'CodeBlocks-quoting'
-----------------------------------------------------------------------
Summary of changes:
Modules/DeployQt4.cmake | 15 ++++++++-------
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list