kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'qt4-deploy' 

2c601c1 DeployQt4: Add path to Qt dlls on Windows.
This commit is contained in:
David Cole 2012-03-08 15:14:40 -05:00 committed by CMake Topic Stage
parent fa0f065426 2c601c100b
commit 36ce6e01f8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/DeployQt4.cmake
View File

@ -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()