From 0cb4a94c884afeb93413c0dbcc98e2b03c475bcc Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Sat, 28 Dec 2024 11:55:59 +0100 Subject: [PATCH] cmake: really disable xrandr by default on Solaris Fixes libsdl-org/SDL#10099 --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d34045de4..94b1c9bfe0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -281,9 +281,9 @@ if(COMMAND SDL_Preseed_CMakeCache) set(SDL_PRESEED_AVAILABLE ON) endif() -set(SDL_X11_XFIXES_DEFAULT ON) +set(SDL_X11_XRANDR_DEFAULT ON) if(SOLARIS) - set(SDL_X11_XFIXES_DEFAULT OFF) + set(SDL_X11_XRANDR_DEFAULT OFF) endif() # Allow some projects to be built conditionally. @@ -345,8 +345,8 @@ dep_option(SDL_X11_SHARED "Dynamically load X11 support" ON "SDL_X11" O dep_option(SDL_X11_XCURSOR "Enable Xcursor support" ON SDL_X11 OFF) dep_option(SDL_X11_XDBE "Enable Xdbe support" ON SDL_X11 OFF) dep_option(SDL_X11_XINPUT "Enable XInput support" ON SDL_X11 OFF) -dep_option(SDL_X11_XFIXES "Enable Xfixes support" "${SDL_X11_XFIXES_DEFAULT}" SDL_X11 OFF) -dep_option(SDL_X11_XRANDR "Enable Xrandr support" ON SDL_X11 OFF) +dep_option(SDL_X11_XFIXES "Enable Xfixes support" ON SDL_X11 OFF) +dep_option(SDL_X11_XRANDR "Enable Xrandr support" "${SDL_X11_XRANDR_DEFAULT}" SDL_X11 OFF) dep_option(SDL_X11_XSCRNSAVER "Enable Xscrnsaver support" ON SDL_X11 OFF) dep_option(SDL_X11_XSHAPE "Enable XShape support" ON SDL_X11 OFF) dep_option(SDL_X11_XSYNC "Enable Xsync support" ON SDL_X11 OFF)