From 25a7334b5f38ffd8f4dd61b8d60e4047e5b8ea3d Mon Sep 17 00:00:00 2001 From: "Anthony J. Bentley" Date: Tue, 19 Sep 2023 02:07:46 -0600 Subject: [PATCH 1/2] Only build with Wayland if USE_WAYLAND_WSI is on. --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f07916377..3930831add 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,10 +188,9 @@ if(UNIX AND NOT (APPLE OR ANDROID) AND VULKAN) find_package(Wayland) if(NOT WAYLAND_FOUND) message(STATUS "Could not find Wayland libraries, disabling Wayland WSI support for Vulkan.") - else() + elseif(USE_WAYLAND_WSI) include_directories(${WAYLAND_INCLUDE_DIR}) add_definitions(-DVK_USE_PLATFORM_WAYLAND_KHR) - add_definitions(-DUSE_WAYLAND_WSI=ON) endif() if(USE_VULKAN_DISPLAY_KHR) From cbab6770756fa67f8798090761c42f162e43be1b Mon Sep 17 00:00:00 2001 From: "Anthony J. Bentley" Date: Tue, 19 Sep 2023 23:17:54 -0600 Subject: [PATCH 2/2] Enable USE_WAYLAND_WSI by default. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3930831add..d143ca8376 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,7 +149,7 @@ option(USING_EGL "Set to ON if target environment uses EGL" ${USING_EGL}) option(USING_FBDEV "Set to ON if target environment uses fbdev (eg. Pandora)" ${USING_FBDEV}) option(USING_GLES2 "Set to ON if target device uses OpenGL ES 2.0" ${USING_GLES2}) option(USING_X11_VULKAN "Set to OFF if target environment doesn't use X11 for Vulkan" ON) -option(USE_WAYLAND_WSI "Enable or disable Wayland WSI support for Vulkan" ${USE_WAYLAND_WSI}) +option(USE_WAYLAND_WSI "Enable or disable Wayland WSI support for Vulkan" ON) option(USE_VULKAN_DISPLAY_KHR "Enable or disable full screen display of Vulkan" ${USE_VULKAN_DISPLAY_KHR}) # :: Frontends option(USING_QT_UI "Set to ON if you wish to use the Qt frontend wrapper" ${USING_QT_UI})