Commit 4b55b13c authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

cmake: remove unnecessary flag `PARAVIEW_ENABLE_MATPLOTLIB`.

Missing matplotlib shouldn't cause errors at runtime unless matplotlib
based features are used. And uses should able to fix them by simply
installing matplotlib without having to rebuild ParaView.
parent 7d079d0d
......@@ -34,7 +34,7 @@ if (numpy_found)
)
unset(paraview_python_args)
if (PARAVIEW_ENABLE_MATPLOTLIB AND matplotlib_found)
if (matplotlib_found)
# add Matplotlib tests only if matplotlib was found at configure time.
paraview_add_test_python(
NO_DATA NO_RT
......
......@@ -960,7 +960,7 @@ if(PARAVIEW_ENABLE_PYTHON)
# Check that matplotlib is available
include(FindPythonModules)
find_python_module(matplotlib matplotlib_found)
if (PARAVIEW_ENABLE_MATPLOTLIB AND matplotlib_found)
if (matplotlib_found)
list(APPEND TESTS_WITH_BASELINES TestPythonView.xml)
endif()
......
......@@ -242,10 +242,6 @@ cmake_dependent_option(PARAVIEW_ENABLE_COMMANDLINE_TOOLS
"NOT PARAVIEW_BUILD_QT_GUI" ON)
option(PARAVIEW_ENABLE_PYTHON "Enable/Disable Python scripting support" OFF)
cmake_dependent_option(PARAVIEW_ENABLE_MATPLOTLIB
"Enable/Disable Python scripting support" ON
"PARAVIEW_ENABLE_PYTHON" OFF)
mark_as_advanced(PARAVIEW_ENABLE_MATPLOTLIB)
# If building on Unix with MPI enabled, we will present another option to
# enable building of CosmoTools VTK extensions. This option is by default
......@@ -306,11 +302,13 @@ if (PARAVIEW_ENABLE_PYTHON)
list(APPEND paraview_requested_modules
ParaView::PythonAlgorithm
ParaView::PythonInitializer)
ParaView::PythonInitializer
VTK::RenderingMatplotlib)
else ()
list(APPEND paraview_rejected_modules
ParaView::PythonAlgorithm
ParaView::PythonInitializer)
ParaView::PythonInitializer
VTK::RenderingMatplotlib)
endif ()
if (PARAVIEW_BUILD_QT_GUI)
......@@ -439,11 +437,6 @@ if (PARAVIEW_USE_ICE_T)
ParaView::icet)
endif ()
if (PARAVIEW_ENABLE_MATPLOTLIB)
list(APPEND paraview_requested_modules
VTK::RenderingMatplotlib)
endif ()
if (PARAVIEW_ENABLE_COSMOTOOLS)
list(APPEND paraview_requested_modules
ParaView::VTKExtensionsCosmoTools)
......
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