Updates will be applied on October 27th between 12pm - 12:45pm EDT (UTC-0400). Gitlab may be slow during the maintenance window.

Commit 21ecf721 authored by Cory Quammen's avatar Cory Quammen Committed by Kitware Robot
Browse files

Merge topic 'vrui-on-linux' into release

bc3152df

 paraview: enable VRUI support only on linux and macos
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !824
parents 805db38e bc3152df
......@@ -332,7 +332,7 @@ The following flags affect ParaView directly:
for the build that are otherwise not exposed in the superbuild itself.
* `PARAVIEW_ENABLE_VRPLUGIN` (default `ON`): Enables the VRPlugin. If
`vrpn` is enabled, the VRPlugin will support input devices through a VRPN
connection. VRUI support is enabled unconditionally.
connection. VRUI support is enabled unconditionally on Linux.
#### ParaView editions
......
......@@ -88,6 +88,13 @@ mark_as_advanced(PARAVIEW_ENABLE_MOTIONFX)
option(PARAVIEW_ENABLE_VRPLUGIN "Enable VRPlugin" ON)
mark_as_advanced(PARAVIEW_ENABLE_VRPLUGIN)
# vrui support is only available on linux
if (PARAVIEW_ENABLE_VRPLUGIN AND UNIX)
list(APPEND paraview_extra_cmake_options
-DPARAVIEW_PLUGIN_VRPlugin_USE_VRUI:BOOL=ON
)
endif()
set(paraview_use_raytracing OFF)
if (ospray_enabled OR visrtx_enabled)
set(paraview_use_raytracing ON)
......@@ -185,7 +192,6 @@ superbuild_add_project(paraview
# vrpn
-DPARAVIEW_PLUGIN_ENABLE_VRPlugin:BOOL=${PARAVIEW_ENABLE_VRPLUGIN}
-DPARAVIEW_PLUGIN_VRPlugin_USE_VRUI:BOOL=${PARAVIEW_ENABLE_VRPLUGIN}
-DPARAVIEW_PLUGIN_VRPlugin_USE_VRPN:BOOL=${vrpn_enabled}
# vtkm
......
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