diff options
| author | Craig Scott <craig.scott@crascit.com> | 2017-12-30 07:33:11 +1100 |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2017-12-30 09:35:56 +1100 |
| commit | 3c413e2a31b4fcb6a99dba04669c6a6517b97832 (patch) | |
| tree | 0e3f6f6776b682f43654f948886e34d482441aa2 /Modules/DeployQt4.cmake | |
| parent | c267ea1c3e54626e4ab2283dc7529ed8aa8beac8 (diff) | |
| download | cmake-3c413e2a31b4fcb6a99dba04669c6a6517b97832.tar.gz | |
GENERATOR_IS_MULTI_CONFIG: Use for multi-config checks in Modules
Diffstat (limited to 'Modules/DeployQt4.cmake')
| -rw-r--r-- | Modules/DeployQt4.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake index 8ada451a6d..28054f8b57 100644 --- a/Modules/DeployQt4.cmake +++ b/Modules/DeployQt4.cmake @@ -259,7 +259,8 @@ function(install_qt4_plugin_path plugin executable copy installed_plugin_path_va file(MAKE_DIRECTORY "${plugins_path}") file(COPY "${plugin}" DESTINATION "${plugins_path}") else() - if(configurations AND (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)) + get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) + if(configurations AND (_isMultiConfig OR CMAKE_BUILD_TYPE)) set(configurations CONFIGURATIONS ${configurations}) else() unset(configurations) @@ -295,7 +296,8 @@ function(install_qt4_plugin plugin executable copy installed_plugin_path_var) set(plugin_debug "${plugin_release}") endif() - if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) + get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) + if(_isMultiConfig OR CMAKE_BUILD_TYPE) install_qt4_plugin_path("${plugin_release}" "${executable}" "${copy}" "${installed_plugin_path_var}_release" "${plugins_dir}" "${component}" "Release|RelWithDebInfo|MinSizeRel") install_qt4_plugin_path("${plugin_debug}" "${executable}" "${copy}" "${installed_plugin_path_var}_debug" "${plugins_dir}" "${component}" "Debug") |