diff options
| author | David Cole <david.cole@kitware.com> | 2011-12-16 15:13:59 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-12-16 15:13:59 (GMT) |
| commit | c68a780dece71b23664ea65c670a5771e638245a (patch) | |
| tree | 0ff9f7ea33742ee009f2774fc8dd8133cd83f64e | |
| parent | e945df2a7ea0d0e0c9a498766bc44e6051a743b9 (diff) | |
| parent | 4e9274e95498e7bf30d912ca6f7fbbb6d6ab970b (diff) | |
| download | CMake-c68a780dece71b23664ea65c670a5771e638245a.zip CMake-c68a780dece71b23664ea65c670a5771e638245a.tar.gz CMake-c68a780dece71b23664ea65c670a5771e638245a.tar.bz2 | |
Merge topic 'qt4-deploy-module'
4e9274e Unset configurations variable when no build type.
| -rw-r--r-- | Modules/DeployQt4.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake index 5350301..80a13d4 100644 --- a/Modules/DeployQt4.cmake +++ b/Modules/DeployQt4.cmake @@ -204,6 +204,8 @@ function(install_qt4_plugin_path plugin executable copy installed_plugin_path_va else() if(configurations AND (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)) set(configurations CONFIGURATIONS ${configurations}) + else() + unset(configurations) endif() if(component) set(component COMPONENT ${component}) |