From f9ab2214ae52c51c068ceff97e5264fd518d8f59 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 8 Oct 2022 08:05:46 +1100 Subject: Linux: enable WAYLAND by default Enable the following CMake options: - WITH_GHOST_WAYLAND Enable Wayland which is now included as part the bundled dependencies. When the pre-compiled libraries aren't used, only X11 will be enabled. - WITH_GHOST_WAYLAND_DYNLOAD So systems without libwayland can fall back to X11. - WITH_GHOST_WAYLAND_LIBDECOR To draw window frames on WAYLAND compositors such as gnome-shell which expect client-side decorations (without this the Blender window is borderless). Unfortunately there doesn't seem to be a reliable way to know if the compositors handles server-side decorations, so libdecor is required for Wayland to be used even with KDE and tiling compositors where it's not needed. Although this is an area that could use some further investigation - possibly bundling libdecor or handling client-side decorations in Blender. The final part of D16091. --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index e02eee8ce35..408cf819ce8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,17 +242,17 @@ if(UNIX AND NOT (APPLE OR HAIKU)) option(WITH_GHOST_X11 "Enable building Blender against X11 for windowing" ON) mark_as_advanced(WITH_GHOST_X11) - option(WITH_GHOST_WAYLAND "Enable building Blender against Wayland for windowing (under development)" OFF) + option(WITH_GHOST_WAYLAND "Enable building Blender against Wayland for windowing" ON) mark_as_advanced(WITH_GHOST_WAYLAND) if(WITH_GHOST_WAYLAND) - option(WITH_GHOST_WAYLAND_LIBDECOR "Optionally build with LibDecor window decorations" OFF) + option(WITH_GHOST_WAYLAND_LIBDECOR "Optionally build with LibDecor window decorations" ON) mark_as_advanced(WITH_GHOST_WAYLAND_LIBDECOR) option(WITH_GHOST_WAYLAND_DBUS "Optionally build with DBUS support (used for Cursor themes). May hang on startup systems where DBUS is not used." OFF) mark_as_advanced(WITH_GHOST_WAYLAND_DBUS) - option(WITH_GHOST_WAYLAND_DYNLOAD "Enable runtime dynamic WAYLAND libraries loading" OFF) + option(WITH_GHOST_WAYLAND_DYNLOAD "Enable runtime dynamic WAYLAND libraries loading" ON) mark_as_advanced(WITH_GHOST_WAYLAND_DYNLOAD) endif() endif() -- cgit v1.2.3