diff options
| author | Mike McQuaid <mike@mikemcquaid.com> | 2011-11-14 16:34:10 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2011-11-14 17:00:08 (GMT) |
| commit | b688f114c9b3c951c6d4640412d33b70974a1dc6 (patch) | |
| tree | daf28046a2fb947895530ea0aa342f597ef5c9ff /Modules/DeployQt4.cmake | |
| parent | 467ee368402b73756ac1b662b86cd0eee95bbe07 (diff) | |
| download | CMake-b688f114c9b3c951c6d4640412d33b70974a1dc6.zip CMake-b688f114c9b3c951c6d4640412d33b70974a1dc6.tar.gz CMake-b688f114c9b3c951c6d4640412d33b70974a1dc6.tar.bz2 | |
Check QtCore without warning.
When debug and release versions of QtCore were available it printed
a warning. This has been fixed.
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() |