From fdf33f90478c2269290562197c2685ae171a9562 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 24 Jan 2025 20:07:51 +0100 Subject: [PATCH] xcode+cmake: Use SDL3.framework/SDL3 as IMPORTED_LOCATION Not adding /SDL3 causes CMake to no longer set the RUNPATh on binaries in the build directory. It also breaks compatibility with CMake versions older then 3.28. reverts c56a3f60fe88e9c8b13d7bfd92363e5d2c9a152f (xcode+cmake: use SDL3.framework folder as IMPORTED_LOCATION) reverts ad3c7b92f8726816580033fdaeb52933419102b8 (xcode+cmake: use SDL3.framework folder as IMPORTED_LOCATION) --- Xcode/SDL/pkg-support/resources/cmake/SDL3Config.cmake | 2 +- Xcode/SDL/pkg-support/share/cmake/SDL3/SDL3Config.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Xcode/SDL/pkg-support/resources/cmake/SDL3Config.cmake b/Xcode/SDL/pkg-support/resources/cmake/SDL3Config.cmake index 03673f3f48..784d27dbb0 100644 --- a/Xcode/SDL/pkg-support/resources/cmake/SDL3Config.cmake +++ b/Xcode/SDL/pkg-support/resources/cmake/SDL3Config.cmake @@ -59,7 +59,7 @@ if(NOT TARGET SDL3::SDL3-shared) set_target_properties(SDL3::SDL3-shared PROPERTIES FRAMEWORK "TRUE" - IMPORTED_LOCATION "${_sdl3_framework_path}" + IMPORTED_LOCATION "${_sdl3_framework_path}/SDL3" INTERFACE_LINK_LIBRARIES "SDL3::Headers" COMPATIBLE_INTERFACE_BOOL "SDL3_SHARED" INTERFACE_SDL3_SHARED "ON" diff --git a/Xcode/SDL/pkg-support/share/cmake/SDL3/SDL3Config.cmake b/Xcode/SDL/pkg-support/share/cmake/SDL3/SDL3Config.cmake index f1585814b8..9d29aae9a3 100644 --- a/Xcode/SDL/pkg-support/share/cmake/SDL3/SDL3Config.cmake +++ b/Xcode/SDL/pkg-support/share/cmake/SDL3/SDL3Config.cmake @@ -112,7 +112,7 @@ if(NOT TARGET SDL3::SDL3-shared) set_target_properties(SDL3::SDL3-shared PROPERTIES FRAMEWORK "TRUE" - IMPORTED_LOCATION "${_sdl3_framework_path}" + IMPORTED_LOCATION "${_sdl3_framework_path}/SDL3" INTERFACE_LINK_LIBRARIES "SDL3::Headers" ) endif()