Fix openxrsdk project

- Fix dependency logic
- Fix ParaView configuration
- Enable openxr in linux and windows

.gitlab/ci/configure_linux_plain.cmake

@@ -6,6 +6,7 @@ set(ENABLE_fides ON CACHE BOOL "")
 set(ENABLE_nvidiaoptix ON CACHE BOOL "")
 set(ENABLE_paraviewtranslations ON CACHE BOOL "")
 set(ENABLE_visrtx ON CACHE BOOL "")
+set(ENABLE_openxr ON CACHE BOOL "")
 set(PARAVIEW_ENABLE_CAVEInteraction ON CACHE BOOL "")
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")

.gitlab/ci/configure_windows.cmake

@@ -5,6 +5,7 @@ set(ENABLE_nvidiaindex ON CACHE BOOL "")
 set(ENABLE_openmp OFF CACHE BOOL "")
 set(ENABLE_openimagedenoise OFF CACHE BOOL "")
 set(ENABLE_openvr ON CACHE BOOL "")
+set(ENABLE_openxr ON CACHE BOOL "")
 set(ENABLE_paraviewtranslations ON CACHE BOOL "")
 set(ENABLE_threedxwaresdk ON CACHE BOOL "")
 set(ENABLE_zeromq ON CACHE BOOL "")

projects/paraview.cmake

@@ -170,10 +170,21 @@ else()
   set(paraview_vtk_module_openvr_enabled NO)
 endif()
 
-if (openvr_enabled AND zeromq_enabled)
-  set(paraview_vr_collaboration_enabled TRUE)
+if (openxrsdk_enabled)
+  set(paraview_vtk_module_openxr_enabled YES)
 else()
-  set(paraview_vr_collaboration_enabled FALSE)
+  set(paraview_vtk_module_openxr_enabled NO)
+endif()
+
+if (openvr_enabled OR openxrsdk_enabled)
+  set(paraview_xrinterface_plugin_enabled TRUE)
+  if (zeromq_enabled)
+    set(paraview_vr_collaboration_enabled TRUE)
+  else()
+    set(paraview_vr_collaboration_enabled FALSE)
+  endif()
+else ()
+  set(paraview_xrinterface_plugin_enabled FALSE)
 endif()
 
 if (openvdb_enabled)
@@ -225,10 +236,12 @@ superbuild_add_project(paraview
     -DPARAVIEW_PLUGIN_ENABLE_GmshIO:BOOL=${gmsh_enabled}
     -DPARAVIEW_PLUGIN_ENABLE_LookingGlass:BOOL=${lookingglass_enabled}
     -DPARAVIEW_PLUGIN_ENABLE_NodeEditor:BOOL=${PARAVIEW_ENABLE_NODEEDITOR}
-    -DPARAVIEW_PLUGIN_ENABLE_XRInterface:BOOL=${openvr_enabled}
     -DPARAVIEW_PLUGIN_dsp_enable_audio_player:BOOL=${qt5_ENABLE_MULTIMEDIA}
+    -DPARAVIEW_PLUGIN_ENABLE_XRInterface:BOOL=${paraview_xrinterface_plugin_enabled}
     -DPARAVIEW_XRInterface_OpenVR_Support:BOOL=${openvr_enabled}
+    -DPARAVIEW_XRInterface_OpenXR_Support:BOOL=${openxrsdk_enabled}
     -DVTK_MODULE_ENABLE_VTK_RenderingOpenVR:STRING=${paraview_vtk_module_openvr_enabled}
+    -DVTK_MODULE_ENABLE_VTK_RenderingOpenXR:STRING=${paraview_vtk_module_openxr_enabled}
     # No netcdftime module in the package.
     -DPARAVIEW_PLUGIN_ENABLE_NetCDFTimeAnnotationPlugin:BOOL=OFF
     -DPARAVIEW_PYTHON_VERSION:STRING=3

projects/win32/openvr.cmake

-
 superbuild_add_project(openvr
   LICENSE_FILES
     LICENSE
-  DEPENDS openxrsdk
   CMAKE_ARGS
     -DBUILD_SHARED:BOOL=TRUE
   INSTALL_COMMAND
@@ -11,11 +9,3 @@ superbuild_add_project(openvr
     -Dinstall_location:PATH=<INSTALL_DIR>
     -P ${CMAKE_CURRENT_LIST_DIR}/scripts/openvr.install.cmake
   )
-
-superbuild_add_extra_cmake_args(
-  -DOpenVR_INCLUDE_DIR:PATH=<INSTALL_DIR>/include/openvr
-  -DOpenVR_LIBRARY:FILEPATH=<INSTALL_DIR>/lib/${CMAKE_IMPORT_LIBRARY_PREFIX}openvr_api${CMAKE_IMPORT_LIBRARY_SUFFIX}
-  -DVTK_MODULE_ENABLE_VTK_RenderingOpenXR:STRING=WANT
-  -DOpenXR_INCLUDE_DIR:PATH=<INSTALL_DIR>/include/openxr
-  -DOpenXR_LIBRARY:FILEPATH=<INSTALL_DIR>/lib/${CMAKE_IMPORT_LIBRARY_PREFIX}openxr_loader${CMAKE_IMPORT_LIBRARY_SUFFIX}
-  )