Skip to content
Snippets Groups Projects
Commit 704322ef authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'edition-io-request-conflicts' into release


8e59cf1a ParaViewOptions: detect bogus configuration requests and error

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !4933
parents aad4b6f1 8e59cf1a
No related branches found
No related tags found
No related merge requests found
......@@ -502,6 +502,27 @@ if (NOT PARAVIEW_ENABLE_NONESSENTIAL)
VTK::theora
VTK::xdmf2
VTK::xdmf3)
function (_paraview_io_option_conflict option name)
if (${option})
message(FATAL_ERROR
"ParaView is configured without I/O support (via the "
"${PARAVIEW_BUILD_EDITION} edition) which is incompatible with the "
"request for ${name} support (via the `${option}` configure option)")
endif ()
endfunction ()
_paraview_io_option_conflict(PARAVIEW_ENABLE_ADIOS2 "ADIOS 2.x")
_paraview_io_option_conflict(PARAVIEW_ENABLE_FFMPEG FFmpeg)
_paraview_io_option_conflict(PARAVIEW_ENABLE_FIDES Fides)
_paraview_io_option_conflict(PARAVIEW_ENABLE_GDAL GDAL)
_paraview_io_option_conflict(PARAVIEW_ENABLE_LAS LAS)
_paraview_io_option_conflict(PARAVIEW_ENABLE_MOTIONFX MotionFX)
_paraview_io_option_conflict(PARAVIEW_ENABLE_OPENTURNS OpenTURNS)
_paraview_io_option_conflict(PARAVIEW_ENABLE_PDAL PDAL)
_paraview_io_option_conflict(PARAVIEW_ENABLE_VISITBRIDGE VisItBridge)
_paraview_io_option_conflict(PARAVIEW_ENABLE_XDMF2 xdmf2)
_paraview_io_option_conflict(PARAVIEW_ENABLE_XDMF3 xdmf3)
endif()
if (NOT PARAVIEW_ENABLE_RENDERING)
......@@ -510,6 +531,18 @@ if (NOT PARAVIEW_ENABLE_RENDERING)
list(APPEND paraview_rejected_modules
VTK::glew
VTK::opengl)
function (_paraview_rendering_option_conflict option name)
if (${option})
message(FATAL_ERROR
"ParaView is configured without Rendering support (via the "
"${PARAVIEW_BUILD_EDITION} edition) which is incompatible with the "
"request for ${name} support (via the `${option}` configure option)")
endif ()
endfunction ()
_paraview_rendering_option_conflict(PARAVIEW_ENABLE_RAYTRACING raytracing)
_paraview_rendering_option_conflict(PARAVIEW_USE_QT Qt)
endif()
if (paraview_requested_modules)
......
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