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 <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !395

projects/apple/paraview.bundle.cmake

@@ -86,6 +86,7 @@ if (python_enabled)
     "${paraview_appname}"
     MODULES paraview
             vtk
+            vtkmodules
             ${python_modules}
     MODULE_DIRECTORIES
             "${superbuild_install_location}/Applications/paraview.app/Contents/Python"
@@ -93,13 +94,6 @@ if (python_enabled)
             "${superbuild_install_location}/Applications/paraview.app/Contents/Libraries"
             "${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)
     install(
       DIRECTORY   "${superbuild_install_location}/lib/python2.7/site-packages/matplotlib/mpl-data/"

projects/win32/paraview.bundle.cmake

@@ -61,6 +61,7 @@ if (python_enabled)
   superbuild_windows_install_python(
     MODULES paraview
             vtk
+            vtkmodules
             ${python_modules}
     MODULE_DIRECTORIES  "${superbuild_install_location}/bin/Lib/site-packages"
                         "${superbuild_install_location}/lib/site-packages"