Commit d4dbac49 authored by Ben Boeckel's avatar Ben Boeckel

qt5: install plugins as well

parent ccb0a6c8
......@@ -182,6 +182,11 @@ function (superbuild_add_packaging)
QT_LIBRARY_DIR)
endif ()
if (USE_SYSTEM_qt5)
list(APPEND superbuild_export_variables
Qt5_DIR)
endif ()
if (NOT DEFINED PARAVIEW_CATALYST_EDITION)
set(PARAVIEW_CATALYST_EDITION Full)
endif ()
......
......@@ -170,4 +170,16 @@ foreach (qt4_plugin_path IN LISTS qt4_plugin_paths)
SEARCH_DIRECTORIES "${library_paths}")
endforeach ()
foreach (qt5_plugin_path IN LISTS qt5_plugin_paths)
get_filename_component(qt5_plugin_group "${qt5_plugin_path}" DIRECTORY)
get_filename_component(qt5_plugin_group "${qt5_plugin_group}" NAME)
superbuild_apple_install_module(
"\${CMAKE_INSTALL_PREFIX}"
"${paraview_appname}"
"${qt5_plugin_path}"
"Contents/Plugins/${qt5_plugin_group}"
SEARCH_DIRECTORIES "${library_paths}")
endforeach ()
paraview_install_extra_data()
......@@ -171,6 +171,36 @@ else ()
set(qt4_plugin_paths)
endif ()
if (qt5_enabled)
include(qt5.functions)
set(qt5_plugin_prefix)
if (NOT WIN32)
set(qt5_plugin_prefix "lib")
endif ()
set(qt5_plugins
sqldrivers/${qt5_plugin_prefix}qsqlite)
if (WIN32)
list(APPEND qt5_plugins
platforms/qwindows)
elseif (APPLE)
list(APPEND qt5_plugins
platforms/libqcocoa
printsupport/libcocoaprintersupport)
elseif (UNIX)
list(APPEND qt5_plugins
platforms/libqxcb
platforminputcontexts/libcomposeplatforminputcontextplugin
xcbglintegrations/libqxcb-glx-integration)
endif ()
superbuild_install_qt5_plugin_paths(qt5_plugin_paths ${qt5_plugins})
else ()
set(qt5_plugin_paths)
endif ()
if (socat_built_by_superbuild)
include(socat.bundle)
endif ()
......@@ -158,4 +158,25 @@ foreach (qt4_plugin_path IN LISTS qt4_plugin_paths)
EXCLUDE_REGEXES ${exclude_regexes})
endforeach ()
if (qt5_enabled)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" "")
install(
FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
DESTINATION "lib/paraview-${paraview_version}"
COMPONENT superbuild)
endif ()
foreach (qt5_plugin_path IN LISTS qt5_plugin_paths)
get_filename_component(qt5_plugin_group "${qt5_plugin_path}" DIRECTORY)
get_filename_component(qt5_plugin_group "${qt5_plugin_group}" NAME)
message(qt5_plugin_group "${qt5_plugin_group}")
superbuild_unix_install_plugin("${qt5_plugin_path}"
"lib/paraview-${paraview_version}"
"lib/paraview-${paraview_version}/plugins/${qt5_plugin_group}/"
SEARCH_DIRECTORIES "${library_paths}"
INCLUDE_REGEXES ${include_regexes}
EXCLUDE_REGEXES ${exclude_regexes})
endforeach ()
paraview_install_extra_data()
......@@ -120,4 +120,14 @@ foreach (qt4_plugin_path IN LISTS qt4_plugin_paths)
"${library_paths}")
endforeach ()
foreach (qt5_plugin_path IN LISTS qt5_plugin_paths)
get_filename_component(qt5_plugin_group "${qt5_plugin_path}" DIRECTORY)
get_filename_component(qt5_plugin_group "${qt5_plugin_group}" NAME)
superbuild_windows_install_plugin(
"${qt5_plugin_path}"
"plugins/${qt5_plugin_group}"
"${library_paths}")
endforeach ()
paraview_install_extra_data()
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