Skip to content
Snippets Groups Projects
Commit 3e7d0331 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit
Browse files

install python package artifacts

Install all artifacts for all installed python packages. Since
`common-superbuild` adds support for it, we no longer need explicit
rules to install `mpl-data` for matplotlib.

Fixes paraview/paraview#20347.
parent 337c83b2
No related branches found
No related tags found
1 merge request!805install python package artifacts
Pipeline #202213 waiting for manual action
This commit is part of merge request !805. Comments created here will be created in the context of that merge request.
......@@ -140,13 +140,6 @@ if (python_enabled)
"${superbuild_install_location}/lib"
INCLUDE_REGEXES ${include_regexes}
IGNORE_REGEXES ${ignore_regexes})
if (matplotlib_enabled)
install(
DIRECTORY "${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages/matplotlib/mpl-data/"
DESTINATION "${paraview_appname}/Contents/Python/matplotlib/mpl-data"
COMPONENT superbuild)
endif ()
endif ()
if (mpi_built_by_superbuild)
......
......@@ -221,13 +221,6 @@ if (python_enabled)
MODULE_DIRECTORIES "${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages"
${egg_dirs}
LOADER_PATHS "${library_paths}")
if (matplotlib_built_by_superbuild)
install(
DIRECTORY "${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages/matplotlib/mpl-data/"
DESTINATION "lib/python${superbuild_python_version}/site-packages/matplotlib/mpl-data"
COMPONENT superbuild)
endif ()
endif ()
if (mpi_built_by_superbuild)
......
......@@ -162,14 +162,6 @@ if (python_enabled)
${library_paths}
EXCLUDE_REGEXES ${exclude_regexes})
if (matplotlib_built_by_superbuild)
install(
DIRECTORY "${superbuild_install_location}/Python/Lib/site-packages/matplotlib/mpl-data/"
DESTINATION "bin/Lib/site-packages/matplotlib/mpl-data"
COMPONENT superbuild)
endif ()
if (pywin32_built_by_superbuild)
install(
DIRECTORY "${superbuild_install_location}/Python/Lib/site-packages/win32"
......
Subproject commit b0778749d6c0f80b1fe3a1061dd98fcbb20b333b
Subproject commit 0a3cd90c0e4e8b8750f41c74e4a0b2635172e76d
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment