From cf3e816603ea2832418daf033b2ec472592210ef Mon Sep 17 00:00:00 2001 From: Tudor Brindus Date: Wed, 27 Jan 2021 00:43:01 -0500 Subject: [PATCH] [client] probe Wayland backend first `$DISPLAY` will be set even in a Wayland session, which causes LG to initialize itself under Xwayland unless it is explicitly compiled with `-DENABLE_X11=OFF`. We could add a Wayland check within the X11 backend, but reordering the code-generated array seems like a better solution. --- client/displayservers/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/displayservers/CMakeLists.txt b/client/displayservers/CMakeLists.txt index 0fa08a80..b40a5378 100644 --- a/client/displayservers/CMakeLists.txt +++ b/client/displayservers/CMakeLists.txt @@ -19,14 +19,14 @@ function(add_displayserver name) endfunction() # Add/remove displayservers here! -if (ENABLE_X11) - add_displayserver(X11) -endif() - if (ENABLE_WAYLAND) add_displayserver(Wayland) endif() +if (ENABLE_X11) + add_displayserver(X11) +endif() + # SDL must be last as it's the fallback implemntation add_displayserver(SDL)