diff options
| author | David Cole <david.cole@kitware.com> | 2011-12-07 21:29:13 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2011-12-07 21:29:13 (GMT) |
| commit | 2d1195123ec85ffd04b415914cc5127db918d2c9 (patch) | |
| tree | 7a05a915e9599c1596aa220ad620c965abe3902b /Modules/DeployQt4.cmake | |
| parent | 1eca18fd522575126b4d1e4faa3c9437d2f12e22 (diff) | |
| parent | 9f18f64c7cfe57df96b6c2cd19d383f9532b6827 (diff) | |
| download | CMake-2d1195123ec85ffd04b415914cc5127db918d2c9.zip CMake-2d1195123ec85ffd04b415914cc5127db918d2c9.tar.gz CMake-2d1195123ec85ffd04b415914cc5127db918d2c9.tar.bz2 | |
Merge branch 'master' into AutomocIncludedDotMocFileHandling
Conflicts:
Source/cmTarget.cxx
Diffstat (limited to 'Modules/DeployQt4.cmake')
| -rw-r--r-- | Modules/DeployQt4.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake index 4bf1b6c..5350301 100644 --- a/Modules/DeployQt4.cmake +++ b/Modules/DeployQt4.cmake @@ -250,7 +250,11 @@ function(install_qt4_executable executable) endif() get_filename_component(executable_absolute "${executable}" ABSOLUTE) - gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY}" qtcore_type) + if(EXISTS "${QT_QTCORE_LIBRARY_RELEASE}") + gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_RELEASE}" qtcore_type) + elseif(EXISTS "${QT_QTCORE_LIBRARY_DEBUG}") + gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_DEBUG}" qtcore_type) + endif() if(qtcore_type STREQUAL "system") set(qt_plugins_dir "") endif() |