Merge topic 'disable-lic-gles'

5fae8fc ci: remove unnecessary cache setting for RenderingLICOpenGL2
327f327 docs: remove unnecessary options from cmake command for wasm
b478ca7 Disable RenderingLICOpenGL2 when using GLES

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Reviewed-by: Sankhesh Jhaveri <[email protected]>
Merge-request: !12102

Author: jspanchu

.gitlab/ci/configure_wasm_common.cmake

@@ -36,7 +36,6 @@ set(VTK_MODULE_ENABLE_VTK_IOPostgreSQL NO CACHE STRING "") # no postgresql
 set(VTK_MODULE_ENABLE_VTK_RenderingExternal NO CACHE STRING "") # gl code incompatible with gles 3.0
 set(VTK_MODULE_ENABLE_VTK_RenderingFFMPEGOpenGL2 NO CACHE STRING "") # no ffmpeg
 set(VTK_MODULE_ENABLE_VTK_RenderingFreeTypeFontConfig NO CACHE STRING "") # no fontconfig
-set(VTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2 NO CACHE STRING "") # gl code incompatible with gles 3.0
 set(VTK_MODULE_ENABLE_VTK_RenderingMatplotlib NO CACHE STRING "") # no matplotlib
 set(VTK_MODULE_ENABLE_VTK_RenderingOpenVR NO CACHE STRING "") # no openvr
 set(VTK_MODULE_ENABLE_VTK_RenderingOpenXR NO CACHE STRING "") # no openxr

CMakeLists.txt

@@ -408,6 +408,12 @@ if (VTK_ENABLE_WRAPPING)
     "via `VTK_ENABLE_WRAPPING`")
 endif ()
 
+if (VTK_OPENGL_USE_GLES)
+  # Do not build modules that require desktop OpenGL when GLES is requested.
+  list(APPEND vtk_rejected_modules
+    VTK::RenderingLICOpenGL2)
+endif ()
+
 if (vtk_requested_modules)
   list(REMOVE_DUPLICATES vtk_requested_modules)
 endif ()

Documentation/docs/advanced/build_wasm_emscripten.md

@@ -74,8 +74,6 @@ $ emcmake cmake \
   -G "Ninja" \
   -DCMAKE_BUILD_TYPE=Release \
   -DBUILD_SHARED_LIBS:BOOL=OFF \
-  -DVTK_ENABLE_WEBGPU:BOOL=ON \
-  -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2:STRING=DONT_WANT
 ```
 
 In order to run the unit tests, please enable testing with `-DVTK_BUILD_TESTING=WANT`. Additionally,