diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-10-15 09:22:01 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-10-15 09:22:01 +0300 |
| commit | aa1f2f243ddb7ed340856ddf97ec650407ad386b (patch) | |
| tree | 471c95b234e7764ff7368e480308f21dc5bb0ca7 /CMakeLists.txt | |
| parent | 278a2137f9a5989f8e9ebb30bbfb761608f0de14 (diff) | |
| parent | ebe9804cfa421b746148f3067797f16e7f460551 (diff) | |
Merge branch 'master' into temp-pbvh-split
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bb685195bd..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() @@ -1913,9 +1913,25 @@ if(FIRST_RUN) info_cfg_option(WITH_INSTALL_PORTABLE) info_cfg_option(WITH_MEM_JEMALLOC) info_cfg_option(WITH_MEM_VALGRIND) - info_cfg_option(WITH_X11_XF86VMODE) - info_cfg_option(WITH_X11_XFIXES) - info_cfg_option(WITH_X11_XINPUT) + + info_cfg_text("GHOST Options:") + info_cfg_option(WITH_GHOST_DEBUG) + info_cfg_option(WITH_GHOST_SDL) + if(UNIX AND NOT APPLE) + info_cfg_option(WITH_GHOST_X11) + info_cfg_option(WITH_GHOST_WAYLAND) + if(WITH_GHOST_X11) + info_cfg_option(WITH_GHOST_XDND) + info_cfg_option(WITH_X11_XF86VMODE) + info_cfg_option(WITH_X11_XFIXES) + info_cfg_option(WITH_X11_XINPUT) + endif() + if(WITH_GHOST_WAYLAND) + info_cfg_option(WITH_GHOST_WAYLAND_DYNLOAD) + info_cfg_option(WITH_GHOST_WAYLAND_LIBDECOR) + info_cfg_option(WITH_GHOST_WAYLAND_DBUS) + endif() + endif() info_cfg_text("Image Formats:") info_cfg_option(WITH_IMAGE_CINEON) |