We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Respect BUILD_SHARED_LIBS when defined

cmake-BUILD_SHARED_LIBS-default-behavior.patch (text/plain), 1.75 KB, created by tschwinger on 2019-04-12 11:05:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tschwinger

Created: 2019-04-12 11:05:37 UTC

Size: 1.75 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 524f83faa..a2108d57c 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -264,8 +264,23 @@ if(EMSCRIPTEN)
>   set(SDL_DLOPEN_ENABLED_BY_DEFAULT OFF)
> endif()
> 
>+# When defined, respect CMake's BUILD_SHARED_LIBS setting:
>+set(SDL_STATIC_ENABLED_BY_DEFAULT ON)
> if (NOT DEFINED SDL_SHARED_ENABLED_BY_DEFAULT)
>+  # ...unless decided already (as for EMSCRIPTEN)
>+
>+  set(SDL_SHARED_ENABLED_BY_DEFAULT OFF)
>+
>+  if (NOT DEFINED BUILD_SHARED_LIBS)
>+    # No preference? Build both, just like the AC/AM configure
>     set(SDL_SHARED_ENABLED_BY_DEFAULT ON)
>+
>+  elseif (BUILD_SHARED_LIBS)
>+    # In this case, we assume the user wants a shared lib and don't build
>+    # the static one
>+    set(SDL_SHARED_ENABLED_BY_DEFAULT ON)
>+    set(SDL_STATIC_ENABLED_BY_DEFAULT OFF)
>+  endif()
> endif()
> 
> set(SDL_SUBSYSTEMS
>@@ -344,10 +359,8 @@ dep_option(KMSDRM_SHARED       "Dynamically load KMS DRM support" ON "VIDEO_KMSD
> option_string(BACKGROUNDING_SIGNAL "number to use for magic backgrounding signal or 'OFF'" "OFF")
> option_string(FOREGROUNDING_SIGNAL "number to use for magic foregrounding signal or 'OFF'" "OFF")
> 
>-# TODO: We should (should we?) respect cmake's ${BUILD_SHARED_LIBS} flag here
>-# The options below are for compatibility to configure's default behaviour.
> set(SDL_SHARED ${SDL_SHARED_ENABLED_BY_DEFAULT} CACHE BOOL "Build a shared version of the library")
>-set(SDL_STATIC ON CACHE BOOL "Build a static version of the library")
>+set(SDL_STATIC ${SDL_STATIC_ENABLED_BY_DEFAULT} CACHE BOOL "Build a static version of the library")
> 
> dep_option(SDL_STATIC_PIC      "Static version of the library should be built with Position Independent Code" OFF "SDL_STATIC" OFF)
> set_option(SDL_TEST            "Build the test directory" OFF)

Actions: View | Diff

Attachments on bug 4593: 3744

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.