Commit 91550eaa authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'paraviewweb-superbuild-modules'

a2970186 paraview: install Python modules if enabled
3491da09 paraviewweb: require pythonwslink
7197b9d1 paraview: enable the mpi4py module if possible
a268505e paraview: fix a style nit
bcaec2cb superbuild: bump for more python modules
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !393
parents 46cccf2c a2970186
Pipeline #87601 passed with stage
in 0 seconds
......@@ -58,7 +58,16 @@ function (superbuild_find_projects var)
paraviewwebdivvy
png
python
pythonautobahn
pythonconstantly
pythonhyperlink
pythonincremental
pythonsetuptools
pythonsix
pythontwisted
pythontxaio
pythonwslink
pythonzopeinterface
qt5
silo
las
......@@ -80,6 +89,7 @@ function (superbuild_find_projects var)
genericio
libxml2
mxml
pythonmpi4py
scipy)
if (NOT APPLE)
......
......@@ -47,48 +47,36 @@ endif ()
set(python_modules
cinema_python
pygments
six)
pygments)
if (numpy_built_by_superbuild)
list(APPEND python_modules
numpy)
endif ()
if (scipy_built_by_superbuild)
list(APPEND python_modules
scipy)
endif ()
if (matplotlib_built_by_superbuild)
list(APPEND python_modules
matplotlib)
endif ()
if (paraviewweb_enabled)
list(APPEND python_modules
autobahn
constantly
hyperlink
incremental
twisted
txaio
wslink
zope)
if (WIN32)
macro (check_for_python_module project module)
if (${project}_built_by_superbuild)
list(APPEND python_modules
adodbapi
isapi
pythoncom
win32com)
"${module}")
endif ()
endmacro ()
check_for_python_module(numpy numpy)
check_for_python_module(scipy scipy)
check_for_python_module(matplotlib matplotlib)
check_for_python_module(pythonsix six)
check_for_python_module(pythonautobahn autobahn)
check_for_python_module(pythonconstantly constantly)
check_for_python_module(pythonhyperlink hyperlink)
check_for_python_module(pythonincremental incremental)
check_for_python_module(pythontwisted twisted)
check_for_python_module(pythontxaio txaio)
check_for_python_module(pythonwslink wslink)
check_for_python_module(pythonzopeinterface zope)
if (WIN32)
check_for_python_module(pywin32 adodbapi)
check_for_python_module(pywin32 isapi)
check_for_python_module(pywin32 pythoncom)
check_for_python_module(pywin32 win32com)
endif ()
if (mpi_enabled)
list(APPEND python_modules
mpi4py)
endif ()
check_for_python_module(pythonmpi4py mpi4py)
function (paraview_add_plugin output)
set(contents "<?xml version=\"1.0\"?>\n<Plugins>\n</Plugins>\n")
......
......@@ -92,6 +92,8 @@ if (UNIX)
list(APPEND paraviews_platform_dependencies
adios ffmpeg libxml2 freetype
pythonmpi4py
# For cosmotools
genericio cosmotools)
endif ()
......@@ -103,8 +105,7 @@ endif ()
if (WIN32)
list(APPEND paraviews_platform_dependencies
openvr
)
openvr)
endif ()
superbuild_add_project(paraview
......@@ -135,6 +136,7 @@ superbuild_add_project(paraview
-DPARAVIEW_ENABLE_XDMF3:BOOL=${xdmf3_enabled}
-DPARAVIEW_ENABLE_LAS:BOOL=${las_enabled}
-DPARAVIEW_USE_MPI:BOOL=${mpi_enabled}
-DModule_vtkParallelMPI4Py:BOOL=${pythonmpi4py_enabled}
-DPARAVIEW_USE_OSPRAY:BOOL=${ospray_enabled}
-DPARAVIEW_USE_VISITBRIDGE:BOOL=${visitbridge_enabled}
-DVISIT_BUILD_READER_CGNS:BOOL=OFF # force to off
......
......@@ -5,4 +5,4 @@ if (WIN32)
endif ()
superbuild_add_dummy_project(paraviewweb
DEPENDS python paraviewwebvisualizer paraviewweblightviz paraviewwebdivvy ${paraviewweb_depends})
DEPENDS python paraviewwebvisualizer paraviewweblightviz paraviewwebdivvy pythonwslink ${paraviewweb_depends})
Subproject commit 0d4c7c63ae97abf32b4f888d6fcc95823ac6fc14
Subproject commit 340089215dbb42c1c8747ef09431c44a98164d7d
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