Commit fec9e635 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'update-superbuild'

45122c57 win32: fix up python install signatures
045ffb13 superbuild: bump
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard's avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !189
parents fe62ecff 45122c57
......@@ -63,25 +63,20 @@ foreach (plugin IN LISTS plugins)
endforeach ()
superbuild_windows_install_python(
"${CMAKE_INSTALL_PREFIX}"
MODULES ${cmb_python_modules}
MODULE_DIRECTORIES
"${superbuild_install_location}/bin/Lib/site-packages"
"${superbuild_install_location}/lib/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES
"lib")
MODULE_DIRECTORIES "${superbuild_install_location}/bin/Lib/site-packages"
"${superbuild_install_location}/lib/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES "lib")
superbuild_windows_install_python(
"${CMAKE_INSTALL_PREFIX}"
MODULES vtk
NAMESPACE paraview
MODULE_DIRECTORIES
"${superbuild_install_location}/bin/Lib/site-packages"
"${superbuild_install_location}/lib/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES
"lib")
NAMESPACE "/paraview"
MODULE_DIRECTORIES "${superbuild_install_location}/bin/Lib/site-packages"
"${superbuild_install_location}/lib/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES "lib")
include(python.functions)
superbuild_install_superbuild_python()
......
Subproject commit e597c0b5e4ca28458154e23a97653b3815b5221f
Subproject commit 7036acf644de444d534437155de1a473fea89601
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