diff options
| author | Mike McQuaid <mike@mikemcquaid.com> | 2011-10-28 16:33:21 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2011-11-01 17:54:35 (GMT) |
| commit | 467ee368402b73756ac1b662b86cd0eee95bbe07 (patch) | |
| tree | 86523c1becd4e5bf5dd73d3a357bb8a8e9916944 | |
| parent | 4571ea6e4d0ecbf25ac7cfa63715cc931f0f17d0 (diff) | |
| download | CMake-467ee368402b73756ac1b662b86cd0eee95bbe07.zip CMake-467ee368402b73756ac1b662b86cd0eee95bbe07.tar.gz CMake-467ee368402b73756ac1b662b86cd0eee95bbe07.tar.bz2 | |
Check plugin variables are defined before warning.
| -rw-r--r-- | Modules/DeployQt4.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
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") |