Disable VTK_USE_X when building EGL (#133)

f3d-app · Dec 24, 2023 · f6ba033 · f6ba033
1 parent f6647e2
commit f6ba033
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/projects/unix/f3d.bundle.cmake b/projects/unix/f3d.bundle.cmake
@@ -91,8 +91,10 @@ if (cpack_generator MATCHES "DEB")
   set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${f3d_url})
   set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
   set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Whisley <[email protected]>")
-  set(CPACK_DEBIAN_PACKAGE_DEPENDS "libbsd0, libxdmcp6, libglvnd0, libxcb1, libc6, libgcc1, libstdc++6, libopengl0, libglx0, libx11-6")
+  set(CPACK_DEBIAN_PACKAGE_DEPENDS "libbsd0, libxdmcp6, libglvnd0, libxcb1, libc6, libgcc1, libstdc++6, libopengl0, libx11-6")
   if (egl_enabled)
     set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libegl1")
+  else ()
+    set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}, libglx0")
   endif ()
 endif ()  
diff --git a/projects/vtk.cmake b/projects/vtk.cmake
@@ -8,10 +8,14 @@ if (exodus_enabled)
   set(vtk_ioexodus_enabled YES)
 endif ()
 
+set(vtk_use_x NO)
 set(vtk_platform_dependencies)
 if (UNIX)
   if (NOT APPLE)
     list(APPEND vtk_platform_dependencies egl)
+    if (NOT egl_enabled)
+      set(vtk_use_x YES)
+    endif ()
   endif ()
 endif ()
 
@@ -66,5 +70,6 @@ superbuild_add_project(vtk
     -DVTK_SMP_ENABLE_STDTHREAD:BOOL=OFF
     -DVTK_SMP_ENABLE_TBB:BOOL=${tbb_enabled}
     -DVTK_SMP_IMPLEMENTATION_TYPE:STRING=${vtk_smp_type}
+    -DVTK_USE_X:BOOL=${vtk_use_x}
     -DVTK_VERSIONED_INSTALL:BOOL=OFF
 )