Commit 5b9aec3b authored by T.J. Corona's avatar T.J. Corona

Use common SBs matplotlib.

parent 2cac7645
Pipeline #67174 passed with stage
......@@ -48,6 +48,7 @@ function (superbuild_find_projects var)
gdal
hdf5
lapack
matplotlib
moab
netcdf
numpy
......@@ -61,7 +62,6 @@ function (superbuild_find_projects var)
pybind11
python
pythongirderclient
pythonmatplotlib
pythonrequests
pythonsetuptools
pythonsix
......
......@@ -97,6 +97,11 @@ set(cmb_python_modules
six
vtk)
if (matplotlib_enabled)
list(APPEND cmb_python_modules
matplotlib)
endif ()
if (numpy_enabled)
list(APPEND cmb_python_modules
numpy)
......
superbuild_add_project_python(pythonmatplotlib
DEPENDS
numpy
pythonsetuptools
pythonsix)
......@@ -34,7 +34,7 @@ superbuild_add_project(smtk
DEFAULT_ON
DEPENDS boost cxx11 hdf5 netcdf
DEPENDS_OPTIONAL cgm cumulus gdal moab netcdf opencv paraview pybind11 python
pythonmatplotlib remus shiboken qt qt4 qt5 vtk vxl
matplotlib remus shiboken qt qt4 qt5 vtk vxl
CMAKE_ARGS
${smtk_extra_cmake_args}
-DBUILD_SHARED_LIBS:BOOL=ON
......@@ -49,7 +49,7 @@ superbuild_add_project(smtk
-DSMTK_ENABLE_REMOTE_SESSION:BOOL=${remus_enabled}
-DSMTK_ENABLE_REMUS_SUPPORT:BOOL=${remus_enabled}
-DSMTK_ENABLE_PYTHON_WRAPPING:BOOL=${smtk_enable_python_wrapping}
-DSMTK_ENABLE_MATPLOTLIB:BOOL=${pythonmatplotlib_enabled}
-DSMTK_ENABLE_MATPLOTLIB:BOOL=${matplotlib_enabled}
-DSMTK_USE_PYBIND11:BOOL=${pybind11_enabled}
-DPYBIND11_INSTALL:BOOL=${pybind11_enabled}
-DSMTK_QT_VERSION:STRING=${qt_version}
......
......@@ -104,10 +104,6 @@ superbuild_set_revision(pythonsix
URL "https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz"
URL_MD5 34eed507548117b2ab523ab14b2f8b55)
superbuild_set_revision(pythonmatplotlib
URL "https://pypi.python.org/packages/f5/f0/9da3ef24ea7eb0ccd12430a261b66eca36b924aeef06e17147f9f9d7d310/matplotlib-2.0.2.tar.gz"
URL_MD5 061111784278bde89b5d4987014be4ca)
superbuild_set_revision(pythonrequests
URL "https://pypi.python.org/packages/source/r/requests/requests-2.9.1.tar.gz"
URL_MD5 0b7f480d19012ec52bab78292efd976d)
......
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