From 6dcb2868b03b21a4cfacf0d5804ee07cfde0a0c7 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 16 Jun 2022 19:53:58 +0200 Subject: [PATCH] cmake: avoid use of possible non-available XEXT_LIB --- cmake/sdlchecks.cmake | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake index 09541ad45..1df48bdc6 100644 --- a/cmake/sdlchecks.cmake +++ b/cmake/sdlchecks.cmake @@ -484,11 +484,19 @@ macro(CheckX11) else() set(HAVE_X11_SHARED TRUE) endif() - if(HAVE_X11_SHARED AND X11_LIB AND XEXT_LIB) - set(SDL_VIDEO_DRIVER_X11_DYNAMIC "\"${X11_LIB_SONAME}\"") - set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "\"${XEXT_LIB_SONAME}\"") - else() - list(APPEND EXTRA_LIBS ${X11_LIB} ${XEXT_LIB}) + if(X11_LIB) + if(HAVE_X11_SHARED) + set(SDL_VIDEO_DRIVER_X11_DYNAMIC "\"${X11_LIB_SONAME}\"") + else() + list(APPEND EXTRA_LIBS ${X11_LIB}) + endif() + endif() + if(XEXT_LIB) + if(HAVE_X11_SHARED) + set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "\"${XEXT_LIB_SONAME}\"") + else() + list(APPEND EXTRA_LIBS ${XEXT_LIB_SONAME}) + endif() endif() else() list(APPEND EXTRA_LIBS ${X11_LIB} ${XEXT_LIB})