diff options
| author | David Cole <david.cole@kitware.com> | 2011-11-15 19:39:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-11-15 19:39:38 (GMT) |
| commit | a9e686d68b5375c471c7204b818fdd2c0a547000 (patch) | |
| tree | e4f1a3b8d2145de8e3d3781afcd7b21dca962a5e /Modules | |
| parent | 7efd93cd722d102d20602663536197904a8f29bf (diff) | |
| parent | b688f114c9b3c951c6d4640412d33b70974a1dc6 (diff) | |
| download | CMake-a9e686d68b5375c471c7204b818fdd2c0a547000.zip CMake-a9e686d68b5375c471c7204b818fdd2c0a547000.tar.gz CMake-a9e686d68b5375c471c7204b818fdd2c0a547000.tar.bz2 | |
Merge topic 'qt4-deploy-module'
b688f11 Check QtCore without warning.
Diffstat (limited to 'Modules')
| -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() |