Skip to content
Snippets Groups Projects
Commit e05b3b4c authored by Mathieu Westphal (Kitware)'s avatar Mathieu Westphal (Kitware) :zap: Committed by Kitware Robot
Browse files

Merge topic 'webengine_packaging'


0ce6b532 Updating superbuild
000ed52f qt5: Add support for packaging QtWebEngine on Win32

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: default avatarBen Boeckel <ben.boeckel@kitware.com>
Reviewed-by: default avatarNicolas Vuaille <nicolas.vuaille@kitware.com>
Reviewed-by: default avatarLucas Givord <lucas.givord@kitware.com>
Merge-request: !1177
parents 240fc7bd 0ce6b532
No related branches found
No related tags found
No related merge requests found
......@@ -328,6 +328,10 @@ function (superbuild_sanity_check)
message(SEND_ERROR "Launchers cannot be enabled since MESA is not enabled and USE_SYSTEM_mpi is ON.")
endif ()
if (UNIX AND qt5_ENABLE_WEBENGINE)
message(WARNING "Packaging QtWebEngine on Linux/macOS is not supported yet, generated package may not be usable")
endif ()
endfunction ()
function (superbuild_add_packaging)
......@@ -358,7 +362,8 @@ function (superbuild_add_packaging)
endif ()
list(APPEND superbuild_export_variables
qt5_version
qt5_ENABLE_MULTIMEDIA)
qt5_ENABLE_MULTIMEDIA
qt5_ENABLE_WEBENGINE)
if (NOT DEFINED PARAVIEW_CATALYST_EDITION)
set(PARAVIEW_CATALYST_EDITION Full)
......@@ -453,7 +458,6 @@ set(qt5_skip_modules
qtserialport
qtwayland
qtwebchannel
qtwebengine
qtwebsockets)
set(boost_libraries
......
......@@ -324,3 +324,7 @@ if (proj_enabled)
DESTINATION "${paraview_appname}/Contents/Resources"
COMPONENT superbuild)
endif ()
if (qt5_ENABLE_WEBENGINE)
message(WARNING "Packaging QtWebEngine on macOS is not supported yet, package may not be usable")
endif ()
......@@ -318,6 +318,7 @@ superbuild_add_project(paraview
# Web
-DPARAVIEW_ENABLE_WEB:BOOL=${paraviewweb_enabled}
-DPARAVIEW_ENABLE_QTWEBENGINE:BOOL=${qt5_ENABLE_WEBENGINE}
# Readers
-DVTK_MODULE_ENABLE_VTK_IOSegY:STRING=YES
......
......@@ -37,3 +37,7 @@ if (paraviewweb_enabled)
DESTINATION "share/paraview-${paraview_version}"
COMPONENT "${paraview_component}")
endif ()
if (qt5_ENABLE_WEBENGINE)
message(WARNING "Packaging QtWebEngine on Linux is not supported yet, package may not be usable")
endif ()
......@@ -255,13 +255,34 @@ foreach (qt5_plugin_path IN LISTS qt5_plugin_paths)
endforeach ()
if (qt5_enabled)
set(qt5_root_dir "${Qt5_DIR}/../../..")
foreach (qt5_opengl_lib IN ITEMS opengl32sw libEGL libGLESv2)
superbuild_windows_install_plugin(
"${Qt5_DIR}/../../../bin/${qt5_opengl_lib}.dll"
"${qt5_root_dir}/bin/${qt5_opengl_lib}.dll"
"bin"
"bin"
SEARCH_DIRECTORIES "${library_paths}")
endforeach ()
if (qt5_ENABLE_WEBENGINE)
_superbuild_windows_install_executable(
"${qt5_root_dir}/bin/QtWebEngineProcess.exe"
"bin"
SEARCH_DIRECTORIES "${library_paths}"
EXCLUDE_REGEXES ${exclude_regexes})
install(
DIRECTORY "${qt5_root_dir}/resources"
DESTINATION "."
COMPONENT superbuild)
install(
FILES "${qt5_root_dir}/bin/qt.conf"
DESTINATION "bin"
COMPONENT superbuild)
endif()
endif ()
if (openxrremoting_enabled)
......
Subproject commit c2ae77a98cf5902641065184271c06feb12fc136
Subproject commit 6999b3a595e1816f40e8018e8ee1aa97c1783452
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment