From 19d3c27e3dda94449d365e4a2831574f1a2cc4ee Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Fri, 22 Dec 2023 14:20:28 +0100 Subject: [PATCH] [cmake] link SDL only static if explicitly requested --- ci/cmake-preloads/config-windows.txt | 1 + client/SDL/CMakeLists.txt | 2 +- packaging/windows/preload.cmake | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/cmake-preloads/config-windows.txt b/ci/cmake-preloads/config-windows.txt index 525646aad..781ae0b59 100644 --- a/ci/cmake-preloads/config-windows.txt +++ b/ci/cmake-preloads/config-windows.txt @@ -18,3 +18,4 @@ set (WITH_SWSCALE OFF CACHE BOOL "ci default") set (WITH_WEBVIEW OFF CACHE BOOL "ci default") set (ZLIB_USE_STATIC_LIBS ON CACHE BOOL "ci default") set (WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") +set (WITH_SDL_LINK_SHARED OFF CACHE BOOL "ci default") diff --git a/client/SDL/CMakeLists.txt b/client/SDL/CMakeLists.txt index ae0b8fb63..e5a7f0f1e 100644 --- a/client/SDL/CMakeLists.txt +++ b/client/SDL/CMakeLists.txt @@ -49,7 +49,7 @@ include(ConfigureRPATH) option(WITH_DEBUG_SDL_EVENTS "[dangerous, not for release builds!] Debug SDL events" OFF) option(WITH_DEBUG_SDL_KBD_EVENTS "[dangerous, not for release builds!] Debug SDL keyboard events" OFF) option(WITH_WIN_CONSOLE "Build ${PROJECT_NAME} with console support" ON) -option(WITH_SDL_LINK_SHARED "link SDL dynamic or static" BUILD_SHARED_LIBS) +option(WITH_SDL_LINK_SHARED "link SDL dynamic or static" ON) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release" CACHE STRING "project default" FORCE) diff --git a/packaging/windows/preload.cmake b/packaging/windows/preload.cmake index 015f5f071..613e077d4 100644 --- a/packaging/windows/preload.cmake +++ b/packaging/windows/preload.cmake @@ -19,3 +19,4 @@ set (WITH_WEBVIEW OFF CACHE BOOL "nightly default") set (ZLIB_USE_STATIC_LIBS ON CACHE BOOL "ci default") set (WITH_SDL_IMAGE_DIALOGS ON CACHE BOOL "nightly default") set (SDL_USE_COMPILED_RESOURCES ON CACHE BOOL "nightly default") +set (WITH_SDL_LINK_SHARED OFF CACHE BOOL "nightly default")