Forráskód Böngészése

cmake: avoid use of possible non-available XEXT_LIB

Anonymous Maarten 2 éve
szülő
commit
6dcb2868b0
1 módosított fájl, 13 hozzáadás és 5 törlés
  1. 13 5
      cmake/sdlchecks.cmake

+ 13 - 5
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})