Updates will be applied on October 27th between 12pm - 12:45pm EDT (UTC-0400). Gitlab may be slow during the maintenance window.

Commit 2c601c10 authored by Clinton Stimpson's avatar Clinton Stimpson
Browse files

DeployQt4: Add path to Qt dlls on Windows.

parent 285f0db9
...@@ -126,6 +126,9 @@ function(fixup_qt4_executable executable) ...@@ -126,6 +126,9 @@ function(fixup_qt4_executable executable)
if(QT_LIBRARY_DIR) if(QT_LIBRARY_DIR)
list(APPEND dirs "${QT_LIBRARY_DIR}") list(APPEND dirs "${QT_LIBRARY_DIR}")
endif() endif()
if(QT_BINARY_DIR)
list(APPEND dirs "${QT_BINARY_DIR}")
endif()
if(APPLE) if(APPLE)
set(qt_conf_dir "${executable}/Contents/Resources") set(qt_conf_dir "${executable}/Contents/Resources")
...@@ -258,6 +261,9 @@ function(install_qt4_executable executable) ...@@ -258,6 +261,9 @@ function(install_qt4_executable executable)
if(QT_LIBRARY_DIR) if(QT_LIBRARY_DIR)
list(APPEND dirs "${QT_LIBRARY_DIR}") list(APPEND dirs "${QT_LIBRARY_DIR}")
endif() endif()
if(QT_BINARY_DIR)
list(APPEND dirs "${QT_BINARY_DIR}")
endif()
if(component) if(component)
set(component COMPONENT ${component}) set(component COMPONENT ${component})
else() else()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment