kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check plugin variables are defined before warning.

This commit is contained in:
Mike McQuaid 2011-10-28 17:33:21 +01:00 committed by David Cole
parent 4571ea6e4d
commit 467ee36840
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/DeployQt4.cmake
View File

@ -225,9 +225,11 @@ function(install_qt4_plugin plugin executable copy installed_plugin_path_var)
else() else()
string(TOUPPER "QT_${plugin}_PLUGIN" plugin_var) string(TOUPPER "QT_${plugin}_PLUGIN" plugin_var)
endif() endif()
set(plugin_release "${${plugin_var}_RELEASE}") set(plugin_release_var "${plugin_var}_RELEASE")
set(plugin_debug "${${plugin_var}_DEBUG}") set(plugin_debug_var "${plugin_var}_DEBUG")
if(NOT EXISTS "${plugin_release}" AND NOT EXISTS "${plugin_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.") message(WARNING "Qt plugin \"${plugin}\" not recognized or found.")
endif() endif()
install_qt4_plugin_path("${plugin_release}" "${executable}" "${copy}" "${installed_plugin_path_var}" "${plugins_dir}" "${component}" "Release|RelWithDebInfo|MinSizeRel") install_qt4_plugin_path("${plugin_release}" "${executable}" "${copy}" "${installed_plugin_path_var}" "${plugins_dir}" "${component}" "Release|RelWithDebInfo|MinSizeRel")