diff options
| author | Mike McQuaid <mike@mikemcquaid.com> | 2011-12-16 16:41:19 +0000 |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2011-12-16 14:31:36 -0700 |
| commit | 3aa5432315fed4cbf983747bda666c6aa7455d9f (patch) | |
| tree | 3eb1368ca6334a02e691329b960bb2ea061be38d /Modules/DeployQt4.cmake | |
| parent | 4e9274e95498e7bf30d912ca6f7fbbb6d6ab970b (diff) | |
| download | cmake-3aa5432315fed4cbf983747bda666c6aa7455d9f.tar.gz | |
Improve component support and output indentation.
Diffstat (limited to 'Modules/DeployQt4.cmake')
| -rw-r--r-- | Modules/DeployQt4.cmake | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake index 80a13d464e..83f322c2d2 100644 --- a/Modules/DeployQt4.cmake +++ b/Modules/DeployQt4.cmake @@ -56,11 +56,12 @@ # (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> <component>]) # 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 # libraries are compatible. The executable will be fixed-up at install time. +# <component> is the COMPONENT used for bundle fixup and plugin installation. # See documentation of FIXUP_QT4_BUNDLE. #============================================================================= @@ -207,9 +208,6 @@ function(install_qt4_plugin_path plugin executable copy installed_plugin_path_va else() unset(configurations) endif() - if(component) - set(component COMPONENT ${component}) - endif() install(FILES "${plugin}" DESTINATION "${plugins_path}" ${configurations} ${component}) endif() set(${installed_plugin_path_var} ${${installed_path_var}} "${plugins_path}/${plugin_name}" PARENT_SCOPE) @@ -246,10 +244,15 @@ function(install_qt4_executable executable) set(dirs ${ARGV3}) set(plugins_dir ${ARGV4}) set(request_qt_conf ${ARGV5}) - set(plugin_component ${ARGV6}) + set(component ${ARGV6}) if(QT_LIBRARY_DIR) list(APPEND dirs "${QT_LIBRARY_DIR}") endif() + if(component) + set(component COMPONENT ${component}) + else() + unset(component) + endif() get_filename_component(executable_absolute "${executable}" ABSOLUTE) if(EXISTS "${QT_QTCORE_LIBRARY_RELEASE}") @@ -267,15 +270,16 @@ function(install_qt4_executable executable) foreach(plugin ${qtplugins}) set(installed_plugin_paths "") - install_qt4_plugin("${plugin}" "${executable}" 0 installed_plugin_paths "${plugins_dir}" "${plugin_component}") + install_qt4_plugin("${plugin}" "${executable}" 0 installed_plugin_paths "${plugins_dir}" "${component}") list(APPEND libs ${installed_plugin_paths}) endforeach() resolve_qt4_paths(libs) install(CODE - " INCLUDE( \"${DeployQt4_cmake_dir}/DeployQt4.cmake\" ) - SET( BU_CHMOD_BUNDLE_ITEMS TRUE ) - FIXUP_QT4_EXECUTABLE( \"\${CMAKE_INSTALL_PREFIX}/${executable}\" \"\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" \"${request_qt_conf}\" ) " + "INCLUDE(\"${DeployQt4_cmake_dir}/DeployQt4.cmake\") + SET(BU_CHMOD_BUNDLE_ITEMS TRUE) + FIXUP_QT4_EXECUTABLE(\"\${CMAKE_INSTALL_PREFIX}/${executable}\" \"\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" \"${request_qt_conf}\")" + ${component} ) endfunction() |