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

Merge topic 'python-install-rules'

0eda7d2b win32: use all search paths for Python libraries
0c7933ac cv2: only require in hydrology
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !192
parents f5cb4d51 0eda7d2b
......@@ -98,11 +98,6 @@ if (numpy_enabled)
numpy)
endif ()
if (opencv_enabled)
list(APPEND cmb_python_modules
cv2)
endif ()
if (pythongirderclient_enabled)
list(APPEND cmb_python_modules
requests
......
......@@ -15,3 +15,8 @@ set(cmb_install_paraview_server TRUE)
set(cmb_install_paraview_python TRUE)
include(cmb.bundle.common)
if (opencv_enabled)
list(APPEND cmb_python_modules
cv2)
endif ()
......@@ -67,7 +67,7 @@ superbuild_windows_install_python(
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")
SEARCH_DIRECTORIES "${library_paths}")
superbuild_windows_install_python(
"${CMAKE_INSTALL_PREFIX}"
......@@ -76,7 +76,7 @@ superbuild_windows_install_python(
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")
SEARCH_DIRECTORIES "${library_paths}")
include(python.functions)
superbuild_install_superbuild_python()
......
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