diff options
| author | David Cole <david.cole@kitware.com> | 2012-03-08 20:14:40 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-03-08 20:14:40 (GMT) |
| commit | 36ce6e01f8a1e7f2bdb5604c7776a4a91fa36400 (patch) | |
| tree | 30c05721c82485daadeaf631ffd69bca2a93ce6f /Modules | |
| parent | fa0f0654262cd74824558c425083e22f091702e0 (diff) | |
| parent | 2c601c100bb1f822da923c31bb4f2c123f1b7edd (diff) | |
| download | CMake-36ce6e01f8a1e7f2bdb5604c7776a4a91fa36400.zip CMake-36ce6e01f8a1e7f2bdb5604c7776a4a91fa36400.tar.gz CMake-36ce6e01f8a1e7f2bdb5604c7776a4a91fa36400.tar.bz2 | |
Merge topic 'qt4-deploy'
2c601c1 DeployQt4: Add path to Qt dlls on Windows.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/DeployQt4.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake index 8a5e9c5..b37695d 100644 --- a/Modules/DeployQt4.cmake +++ b/Modules/DeployQt4.cmake @@ -126,6 +126,9 @@ function(fixup_qt4_executable executable) if(QT_LIBRARY_DIR) list(APPEND dirs "${QT_LIBRARY_DIR}") endif() + if(QT_BINARY_DIR) + list(APPEND dirs "${QT_BINARY_DIR}") + endif() if(APPLE) set(qt_conf_dir "${executable}/Contents/Resources") @@ -258,6 +261,9 @@ function(install_qt4_executable executable) if(QT_LIBRARY_DIR) list(APPEND dirs "${QT_LIBRARY_DIR}") endif() + if(QT_BINARY_DIR) + list(APPEND dirs "${QT_BINARY_DIR}") + endif() if(component) set(component COMPONENT ${component}) else() |