Commit 3d755cf5 authored by David Partyka's avatar David Partyka
Browse files

Merge branch 'sync-release-vtk-python' into release

parents 887326ef 396324b5
......@@ -195,12 +195,12 @@ SET(VTK_INSTALL_NO_DEVELOPMENT ${PV_INSTALL_NO_DEVELOPMENT})
# This will disable installing of vtkpython executable and the vtk python
# module. This is essential since we don't want to conflict with kosher VTK
# installations.
SET (VTK_INSTALL_NO_PYTHON 1)
SET (VTK_INSTALL_NO_VTKPYTHON 1)
SET (VTK_INSTALL_NO_PYTHON ON)
SET (VTK_INSTALL_NO_VTKPYTHON ON)
# Tell VTK to install python extension modules using CMake so they get installed
# with the other python extension modules ParaView creates.
SET (VTK_INSTALL_PYTHON_USING_CMAKE 1)
SET (VTK_INSTALL_NO_QT_PLUGIN 1)
SET (VTK_INSTALL_PYTHON_USING_CMAKE ON)
SET (VTK_INSTALL_NO_QT_PLUGIN ON)
SET (VTK_INSTALL_NO_LIBRARIES ${PV_INSTALL_NO_LIBRARIES})
# KWCommon config
......
VTK @ 92251c9c
Subproject commit d8d75feb0eca38c58b2b06fb016f646317687666
Subproject commit 92251c9cef1b820543e8657a82e639570afa0eb8
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