Commit 74d39b5e authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot
Browse files

Merge topic 'mpi4py_fixes'

265017a4 unix missing 'vtkmodules'. fixed it.
9b4e79e2 Add dependency on pygments.
dd8d8119 don't use superbuild's mpi4py.
a1ec2cd2 update fix twisted on macos
a3e4a25d

 Fix paraviewweb dependencies.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !404
parents c8006d9a 265017a4
......@@ -61,6 +61,7 @@ function (superbuild_find_projects var)
pythonconstantly
pythonhyperlink
pythonincremental
pythonpygments
pythonsetuptools
pythonsix
pythontwisted
......@@ -88,7 +89,6 @@ function (superbuild_find_projects var)
genericio
libxml2
mxml
pythonmpi4py
scipy)
if (NOT APPLE)
......
......@@ -47,7 +47,8 @@ endif ()
set(python_modules
cinema_python
pygments)
pygments
mpi4py)
macro (check_for_python_module project module)
if (${project}_built_by_superbuild)
......@@ -59,6 +60,7 @@ endmacro ()
check_for_python_module(numpy numpy)
check_for_python_module(scipy scipy)
check_for_python_module(matplotlib matplotlib)
check_for_python_module(pythonpygments pygments)
check_for_python_module(pythonsix six)
check_for_python_module(pythonautobahn autobahn)
check_for_python_module(pythonconstantly constantly)
......@@ -76,8 +78,6 @@ if (WIN32)
check_for_python_module(pywin32 win32com)
endif ()
check_for_python_module(pythonmpi4py mpi4py)
function (paraview_add_plugin output)
set(contents "<?xml version=\"1.0\"?>\n<Plugins>\n</Plugins>\n")
foreach (name IN LISTS ARGN)
......
......@@ -92,8 +92,6 @@ if (UNIX)
list(APPEND paraviews_platform_dependencies
adios ffmpeg libxml2 freetype
pythonmpi4py
# For cosmotools
genericio cosmotools)
endif ()
......@@ -142,7 +140,6 @@ 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,20 @@ if (WIN32)
endif ()
superbuild_add_dummy_project(paraviewweb
DEPENDS python paraviewwebvisualizer paraviewweblightviz paraviewwebdivvy pythonwslink ${paraviewweb_depends})
DEPENDS
python
paraviewwebvisualizer
paraviewweblightviz
paraviewwebdivvy
pythonwslink
pythonautobahn
pythonconstantly
pythonhyperlink
pythonincremental
pythonsetuptools
pythonsix
pythontwisted
pythontxaio
pythonwslink
pythonzopeinterface
${paraviewweb_depends})
......@@ -78,6 +78,7 @@ if (python_enabled)
LIBDIR "lib"
MODULES paraview
vtk
vtkmodules
${python_modules}
INCLUDE_REGEXES ${include_regexes}
EXCLUDE_REGEXES ${exclude_regexes}
......
Subproject commit 2f522742ca5178b7677017481f127a1bae7150fa
Subproject commit c9217bc9eedc003c1100e61a2c631bae655efbcd
Supports Markdown
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