Commit de352e83 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot

Merge topic 'fix-python-packages'

508f7b18 win32: bundle the new vtkmodules package.
121ae6f1 macOS: package `vtkmodules` and more hack for `paraview.vtk`
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !395
parents ea2d93aa 508f7b18
Pipeline #86428 passed with stage
in 0 seconds
...@@ -86,6 +86,7 @@ if (python_enabled) ...@@ -86,6 +86,7 @@ if (python_enabled)
"${paraview_appname}" "${paraview_appname}"
MODULES paraview MODULES paraview
vtk vtk
vtkmodules
${python_modules} ${python_modules}
MODULE_DIRECTORIES MODULE_DIRECTORIES
"${superbuild_install_location}/Applications/paraview.app/Contents/Python" "${superbuild_install_location}/Applications/paraview.app/Contents/Python"
...@@ -93,13 +94,6 @@ if (python_enabled) ...@@ -93,13 +94,6 @@ if (python_enabled)
"${superbuild_install_location}/Applications/paraview.app/Contents/Libraries" "${superbuild_install_location}/Applications/paraview.app/Contents/Libraries"
"${superbuild_install_location}/lib") "${superbuild_install_location}/lib")
install(CODE
"file(REMOVE_RECURSE \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${paraview_appname}/Contents/Python/paraview/vtk\")
file(INSTALL
\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${paraview_appname}/Contents/Python/vtk\"
DESTINATION \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${paraview_appname}/Contents/Python/paraview/\")"
COMPONENT superbuild)
if (matplotlib_enabled) if (matplotlib_enabled)
install( install(
DIRECTORY "${superbuild_install_location}/lib/python2.7/site-packages/matplotlib/mpl-data/" DIRECTORY "${superbuild_install_location}/lib/python2.7/site-packages/matplotlib/mpl-data/"
......
...@@ -61,6 +61,7 @@ if (python_enabled) ...@@ -61,6 +61,7 @@ if (python_enabled)
superbuild_windows_install_python( superbuild_windows_install_python(
MODULES paraview MODULES paraview
vtk vtk
vtkmodules
${python_modules} ${python_modules}
MODULE_DIRECTORIES "${superbuild_install_location}/bin/Lib/site-packages" MODULE_DIRECTORIES "${superbuild_install_location}/bin/Lib/site-packages"
"${superbuild_install_location}/lib/site-packages" "${superbuild_install_location}/lib/site-packages"
......
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