Commit 66f8712b authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'qt5-plugin-detection'

6bfc95d9 qt5: package windows and mscos stypes for 5.10+
ae4b389d qt5: provide the version of Qt5 to the packaging step
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Bob Obara's avatarBob Obara <bob.obara@kitware.com>
Acked-by: T.J. Corona's avatarT.J. Corona <tj.corona@kitware.com>
Merge-request: !483
parents 457f3ffd 6bfc95d9
......@@ -176,7 +176,13 @@ function (superbuild_add_packaging)
if (USE_SYSTEM_qt5)
list(APPEND superbuild_export_variables
Qt5_DIR)
find_package(Qt5 QUIET REQUIRED COMPONENTS Core)
set(qt5_version "${Qt5Core_VERSION_MAJOR}.${Qt5Core_VERSION_MINOR}")
else ()
set(qt5_version "${qt5_SOURCE_SELECTION}")
endif ()
list(APPEND superbuild_export_variables
qt5_version)
include(cmb.suffix)
list(APPEND superbuild_export_variables
......
......@@ -179,10 +179,20 @@ if (qt5_enabled)
if (WIN32)
list(APPEND qt5_plugins
platforms/qwindows)
if (NOT qt5_version VERSION_LESS "5.10")
list(APPEND qt5_plugins
styles/libqwindowsvistastyle)
endif ()
elseif (APPLE)
list(APPEND qt5_plugins
platforms/libqcocoa
printsupport/libcocoaprintersupport)
if (NOT qt5_version VERSION_LESS "5.10")
list(APPEND qt5_plugins
styles/libqmacstyle)
endif ()
elseif (UNIX)
list(APPEND qt5_plugins
platforms/libqxcb
......
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