Commit 27affa52 authored by T.J. Corona's avatar T.J. Corona

Update packaging logic to reflect ParaView, CMB updates.

parent b45fd52e
Pipeline #108236 passed with stage
......@@ -88,13 +88,6 @@ foreach(program IN LISTS cmb_programs_to_install)
"${superbuild_install_location}/lib"
"${superbuild_install_location}/Applications/paraview.app/Contents/Libraries")
# Install the paraview.vtk module.
install(CODE
"file(INSTALL
FILES \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${cmb_package}/${program}.app/Contents/Python/vtk/\"
DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${cmb_package}/${program}.app/Contents/Python/paraview/vtk\")"
COMPONENT superbuild)
if (matplotlib_enabled)
install(
DIRECTORY "${superbuild_install_location}/lib/python2.7/site-packages/matplotlib/mpl-data/"
......
......@@ -52,17 +52,22 @@ if (cmb_install_paraview_python)
endif ()
set(cmb_plugins_smtk
smtkAttributePlugin
smtkDefaultPlugins
smtkDelaunayPlugin
smtkDiscreteSessionPlugin
smtkExodusSessionPlugin
smtkMeshPlugin
smtkMeshSessionPlugin
smtkModelPlugin
smtkOpenCVPlugin
smtkOperationPlugin
smtkPQComponentsPlugin
smtkPQOperationViewsPlugin
smtkPVServerExtPlugin
smtkPQOperatorViewsPlugin
smtkPluginSupport
smtkPolygonSessionPlugin
smtkRemoteSessionPlugin
smtkRemusMeshOperatorPlugin
smtkVTKOperatorsPlugin
smtkRemusMeshOperationPlugin
smtkVTKOperationsPlugin
)
if (cgm_enabled)
......@@ -77,10 +82,12 @@ endif ()
if (vxl_enabled)
list(APPEND cmb_plugins_smtk
smtkVXLOperatorViewsPlugin)
smtkVXLOperationViewsPlugin)
endif ()
set(cmb_plugins_cmb)
set(cmb_plugins_cmb
cmbPostProcessingModePlugin
)
set(cmb_plugins_all
${cmb_plugins_smtk}
......@@ -97,7 +104,8 @@ set(cmb_python_modules
cinema_python
pygments
six
vtk)
vtk
vtkmodules)
if (matplotlib_enabled)
list(APPEND cmb_python_modules
......
......@@ -3,9 +3,9 @@ set(library_paths
"${superbuild_install_location}/lib/paraview-${paraview_version}"
"${superbuild_install_location}/lib/cmb-${cmb_version}")
if (QT_LIBRARY_DIR)
if (Qt5_DIR)
list(APPEND library_paths
"${QT_LIBRARY_DIR}")
"${Qt5_DIR}/../..")
endif ()
if (USE_SYSTEM_qt5 AND Qt5_DIR)
......@@ -24,7 +24,7 @@ foreach (executable IN LISTS paraview_executables cmb_programs_to_install)
EXCLUDE_REGEXES ${exclude_regexes})
else ()
superbuild_unix_install_program_fwd("${executable}"
"lib/paraview-${paraview_version};lib/cmb-${cmb_version}"
"lib;lib/paraview-${paraview_version};lib/cmb-${cmb_version}"
SEARCH_DIRECTORIES "${library_paths}"
INCLUDE_REGEXES ${include_regexes}
EXCLUDE_REGEXES ${exclude_regexes})
......@@ -54,19 +54,10 @@ superbuild_unix_install_python(
INCLUDE_REGEXES ${include_regexes}
EXCLUDE_REGEXES ${exclude_regexes})
superbuild_unix_install_python(
MODULE_DESTINATION "/site-packages/paraview"
LIBDIR "lib/cmb-${cmb_version}"
MODULES vtk
MODULE_DIRECTORIES "${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES "${library_paths}"
INCLUDE_REGEXES ${include_regexes}
EXCLUDE_REGEXES ${exclude_regexes})
if (cmb_install_paraview_python)
superbuild_unix_install_python(
LIBDIR "lib/paraview-${paraview_version}"
MODULES paraview vtk
MODULES paraview vtkmodules
MODULE_DIRECTORIES "${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES "${library_paths}"
......
......@@ -14,6 +14,7 @@ set(pvrenderserver_description "ParaView (render server)")
set(pvpython_description "ParaView (Python shell)")
set(library_paths "lib")
list(APPEND library_paths "bin")
if (Qt5_DIR)
list(APPEND library_paths
......@@ -76,15 +77,6 @@ superbuild_windows_install_python(
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES "${library_paths}")
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 "${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