Commit 510368b8 authored by Ben Boeckel's avatar Ben Boeckel

packages: refactor required python modules out

parent 54b08e39
......@@ -87,26 +87,12 @@ foreach(program IN LISTS cmb_programs_to_install)
superbuild_apple_install_python(
"\${CMAKE_INSTALL_PREFIX}/${cmb_package}"
"${program}.app"
MODULES smtk
shiboken
cv2
numpy
${python_modules}
MODULES ${cmb_python_modules}
MODULE_DIRECTORIES
"${superbuild_install_location}/lib/python2.7/site-packages"
SEARCH_DIRECTORIES
"${superbuild_install_location}/lib")
superbuild_apple_install_python(
"\${CMAKE_INSTALL_PREFIX}/${cmb_package}"
"${program}.app"
MODULES paraview
pygments
six
vtk
MODULE_DIRECTORIES
"${superbuild_install_location}/Applications/paraview.app/Contents/Python"
SEARCH_DIRECTORIES
"${superbuild_install_location}/lib"
"${superbuild_install_location}/Applications/paraview.app/Contents/Libraries")
# Install the paraview.vtk module.
......
......@@ -84,3 +84,27 @@ set(cmb_plugins_ModelBuilder
${cmb_plugins_smtk})
set(cmb_plugins_paraview
CMB_Plugin)
set(cmb_python_modules
smtk
shiboken
paraview
pygments
six
vtk)
if (numpy_enabled)
list(APPEND cmb_python_modules
numpy)
endif ()
if (opencv_enabled)
list(APPEND cmb_python_modules
cv2)
endif ()
if (pythongirderclient_enabled)
list(APPEND cmb_python_modules
requests
girder_client)
endif ()
......@@ -24,25 +24,10 @@ foreach (plugin IN LISTS plugins)
"cmb-${cmb_version}/plugins/")
endforeach ()
set(python_modules)
if (pythongirderclient_enabled)
list(APPEND python_modules
requests
girder_client)
endif ()
superbuild_unix_install_python(
"${CMAKE_INSTALL_PREFIX}"
"cmb-${cmb_version}"
MODULES smtk
shiboken
paraview
pygments
six
vtk
numpy
cv2
${python_modules}
MODULES ${cmb_python_modules}
MODULE_DIRECTORIES
"${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
......
......@@ -43,24 +43,9 @@ foreach (plugin IN LISTS plugins)
"${library_paths}")
endforeach ()
set(python_modules)
if (pythongirderclient_enabled)
list(APPEND python_modules
requests
girder_client)
endif ()
superbuild_windows_install_python(
"${CMAKE_INSTALL_PREFIX}"
MODULES smtk
shiboken
paraview
pygments
six
vtk
cv2
numpy
${python_modules}
MODULES ${cmb_python_modules}
MODULE_DIRECTORIES
"${superbuild_install_location}/bin/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