diff options
| author | Mike McQuaid <mike@mikemcquaid.com> | 2012-01-11 15:39:12 (GMT) |
|---|---|---|
| committer | Mike McQuaid <mike@mikemcquaid.com> | 2012-02-21 17:13:09 (GMT) |
| commit | 0ac15353e0220e296aca1bb725fc495c1321e4e6 (patch) | |
| tree | 950464a6cedd955aa8373acfb7b5a22c86dc56fc /Modules | |
| parent | a2123e8f3e04b3e1bd5507c488a22a358398232e (diff) | |
| download | CMake-0ac15353e0220e296aca1bb725fc495c1321e4e6.zip CMake-0ac15353e0220e296aca1bb725fc495c1321e4e6.tar.gz CMake-0ac15353e0220e296aca1bb725fc495c1321e4e6.tar.bz2 | |
Fix bad plugin paths.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/DeployQt4.cmake | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake index ac9cc29..aba339a 100644 --- a/Modules/DeployQt4.cmake +++ b/Modules/DeployQt4.cmake @@ -82,6 +82,7 @@ include(BundleUtilities) set(DeployQt4_cmake_dir "${CMAKE_CURRENT_LIST_DIR}") +set(DeployQt4_apple_plugins_dir "PlugIns") function(write_qt4_conf qt_conf_dir qt_conf_contents) set(qt_conf_path "${qt_conf_dir}/qt.conf") @@ -130,6 +131,9 @@ function(fixup_qt4_executable executable) set(qt_conf_dir "${executable}/Contents/Resources") set(executable_path "${executable}") set(write_qt_conf TRUE) + if(NOT plugins_dir) + set(plugins_dir "${DeployQt4_apple_plugins_dir}") + endif() else() get_filename_component(executable_path "${executable}" PATH) if(NOT executable_path) @@ -166,23 +170,19 @@ function(install_qt4_plugin_path plugin executable copy installed_plugin_path_va set(component ${ARGV5}) set(configurations ${ARGV6}) if(EXISTS "${plugin}") - if(plugins_dir) - set(plugins_dir "${plugins_dir}") - else() - if(APPLE) - set(plugins_dir "PlugIns") - else() - set(plugins_dir "plugins") - endif() - endif() if(APPLE) + if(NOT plugins_dir) + set(plugins_dir "${DeployQt4_apple_plugins_dir}") + endif() set(plugins_path "${executable}/Contents/${plugins_dir}") else() - get_filename_component(executable_path "${executable}" PATH) - if(NOT executable_path) - set(executable_path ".") + get_filename_component(plugins_path "${executable}" PATH) + if(NOT plugins_path) + set(plugins_path ".") + endif() + if(plugins_dir) + set(plugins_path "${plugins_path}/${plugins_dir}") endif() - set(plugins_path "${executable_path}/${plugins_dir}") endif() set(plugin_group "") |