Try to disable SDL Framework installation

freeorion · Dec 23, 2024 · 98fff57 · 98fff57
1 parent 5289a77
commit 98fff57
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 140 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -374,9 +374,9 @@ if(WIN32)
 else()
     set(SDL_CONFIGURE_FLAGS
         -DBUILD_SHARED_LIBS=ON
-        -DBUILD_FRAMEWORK=ON
+	-DBUILD_FRAMEWORK=OFF
     )
-    set(SDL_CONFIGURE_INSTALL_DIR ${SDK_INSTALL_DIR}/Frameworks)
+    set(SDL_CONFIGURE_INSTALL_DIR ${SDK_INSTALL_DIR})
 endif()
 
 ExternalProject_PatchSet(sdl SDL_PATCHSET)

diff --git a/patches/sdl/0004-CMake-Add-MacOSX-Framework-support.patch b/patches/sdl/0004-CMake-Add-MacOSX-Framework-support.patch
diff --git a/patches/sdl/0005-CMake-Set-framework-install-directory.patch b/patches/sdl/0005-CMake-Set-framework-install-directory.patch
diff --git a/patches/sdl/0006-CMake-Use-PUBLIC_HEADER-property-to-install-headers.patch b/patches/sdl/0006-CMake-Use-PUBLIC_HEADER-property-to-install-headers.patch