python3: support non-sytem python3 on unix/windows

(cherry picked from commit 57e79ada)

CMakeLists.txt

@@ -48,7 +48,6 @@ function (superbuild_find_projects var)
     freetype
     hdf5
     ispc
-    lapack
     las
     matplotlib
     mpi
@@ -64,12 +63,14 @@ function (superbuild_find_projects var)
     paraviewwebflow
     paraviewwebvisualizer
     png
+    pythonattrs
     pythonautobahn
     pythonconstantly
     pythoncycler
     pythondateutil
     pythonhyperlink
     pythonincremental
+    pythonkiwisolver
     pythonmako
     pythonpygments
     pythonpyparsing
@@ -96,9 +97,11 @@ function (superbuild_find_projects var)
     list(APPEND projects
       adios
       cosmotools
+      ffi
       ffmpeg
       fortran
       genericio
+      lapack
       libxml2
       mili
       mxml

projects/paraview.bundle.common.cmake

@@ -68,7 +68,10 @@ endmacro ()
 check_for_python_module(numpy numpy)
 check_for_python_module(numpy pkg_resources)
 check_for_python_module(scipy scipy)
+check_for_python_module(pythonkiwisolver kiwisolver)
 check_for_python_module(matplotlib matplotlib)
+check_for_python_module(matplotlib mpl_toolkits)
+check_for_python_module(pythonattrs attr)
 check_for_python_module(pythonpygments pygments)
 check_for_python_module(pythonsix six)
 check_for_python_module(pythonautobahn autobahn)

projects/unix/paraview.bundle.unix.cmake

@@ -141,6 +141,10 @@ if (python_enabled)
     include(python2.functions)
     superbuild_install_superbuild_python2(
       LIBSUFFIX "/python${superbuild_python_version}")
+  elseif (python3_built_by_superbuild)
+    include(python3.functions)
+    superbuild_install_superbuild_python3(
+      LIBSUFFIX "/python${superbuild_python_version}")
   endif ()
 
   # Add extra paths to MODULE_DIRECTORIES here (.../local/lib/python${superbuild_python_version}/dist-packages)

projects/win32/paraview.bundle.cmake

@@ -31,9 +31,14 @@ if (Qt5_DIR)
 endif ()
 
 set(exclude_regexes)
-if (python3_enabled AND NOT python3_built_by_superbuild)
+if (python3_enabled)
+  if (python3_built_by_superbuild)
+    list(APPEND library_paths
+      "${superbuild_install_location}/Python")
+  else()
     list(APPEND exclude_regexes
         ".*python3[0-9]+.dll")
+  endif()
 endif ()
 
 # Install paraview executables to bin.
@@ -123,41 +128,54 @@ if (python_enabled)
   if (python2_built_by_superbuild)
     include(python2.functions)
     superbuild_install_superbuild_python2()
+  elseif (python3_built_by_superbuild)
+    include(python3.functions)
+    superbuild_install_superbuild_python3()
   endif ()
 
+  if (python3_enabled)
+    set(python_prefix "Python")
+  else()
+    set(python_prefix "bin")
+  endif()
+
   superbuild_windows_install_python(
     MODULES paraview
             vtk
             vtkmodules
             ${python_modules}
-    MODULE_DIRECTORIES  "${superbuild_install_location}/bin/Lib/site-packages"
+    MODULE_DIRECTORIES  "${superbuild_install_location}/${python_prefix}/Lib/site-packages"
+                        "${superbuild_install_location}/bin/Lib/site-packages"
                         "${superbuild_install_location}/lib/site-packages"
                         "${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages"
                         "${superbuild_install_location}/lib/paraview-${paraview_version_major}.${paraview_version_minor}/site-packages"
     SEARCH_DIRECTORIES  "${superbuild_install_location}/lib"
                         "${superbuild_install_location}/bin"
+                        "${superbuild_install_location}/${python_prefix}"
     EXCLUDE_REGEXES     ${exclude_regexes})
 
+
   if (matplotlib_built_by_superbuild)
     install(
-      DIRECTORY   "${superbuild_install_location}/bin/Lib/site-packages/matplotlib/mpl-data/"
+      DIRECTORY   "${superbuild_install_location}/${python_prefix}/Lib/site-packages/matplotlib/mpl-data/"
       DESTINATION "bin/Lib/site-packages/matplotlib/mpl-data"
       COMPONENT   superbuild)
   endif ()
-endif ()
 
-if (paraviewweb_enabled)
   if (pywin32_built_by_superbuild)
       install(
-        DIRECTORY   "${superbuild_install_location}/bin/Lib/site-packages/win32"
+        DIRECTORY   "${superbuild_install_location}/${python_prefix}/Lib/site-packages/win32"
         DESTINATION "bin/Lib/site-packages"
         COMPONENT   "superbuild")
       install(
-        FILES       "${superbuild_install_location}/bin/Lib/site-packages/pywin32.pth"
-                    "${superbuild_install_location}/bin/Lib/site-packages/pywin32.version.txt"
+        FILES       "${superbuild_install_location}/${python_prefix}/Lib/site-packages/pywin32.pth"
+                    "${superbuild_install_location}/${python_prefix}/Lib/site-packages/pywin32.version.txt"
         DESTINATION "bin/Lib/site-packages"
         COMPONENT   "superbuild")
   endif ()
+endif ()
+
+if (paraviewweb_enabled)
   install(
     DIRECTORY   "${superbuild_install_location}/share/paraview/web"
     DESTINATION "share/paraview-${paraview_version}"

superbuild @ 1c963658

-Subproject commit af264cb2aa83883de4448fb220bb517a72d63085
+Subproject commit 1c9636588eff7b17a35cf94cf22a185560a89aff