From 3795258b4e766e4ac922a191886e467fe58d381f Mon Sep 17 00:00:00 2001 From: a dinosaur Date: Sat, 3 May 2025 18:47:48 +1000 Subject: [PATCH] cmake: Use public SDLSwift interfaces --- External/SDLSwift | 2 +- Sources/Voxelotl/CMakeLists.txt | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/External/SDLSwift b/External/SDLSwift index fa39d4d..2b1c35e 160000 --- a/External/SDLSwift +++ b/External/SDLSwift @@ -1 +1 @@ -Subproject commit fa39d4dcadbd50c1a78dbdeec7b54f911954bf0e +Subproject commit 2b1c35e60be2812a0256f8199ffdad6b98d940a1 diff --git a/Sources/Voxelotl/CMakeLists.txt b/Sources/Voxelotl/CMakeLists.txt index 8dfaf8f..350ed3f 100644 --- a/Sources/Voxelotl/CMakeLists.txt +++ b/Sources/Voxelotl/CMakeLists.txt @@ -97,7 +97,7 @@ set_source_files_properties( ) target_include_directories(Voxelotl PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}") -target_link_libraries(Voxelotl PRIVATE SDLSwift) +target_link_libraries(Voxelotl PRIVATE SDLSwift::SDL3) target_compile_definitions(Voxelotl PRIVATE $<$:DEBUG>) if(VOXELOTL_MOBILE_ENABLED) @@ -110,12 +110,10 @@ else() set(VOXELOTL_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/Voxelotl.entitlements") endif() +sdl3swift_xcode_properties(Voxelotl) set_target_properties(Voxelotl PROPERTIES XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME YES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "gay.pizza.voxelotl" - XCODE_EMBED_FRAMEWORKS "${SDL3}" - XCODE_EMBED_FRAMEWORKS_REMOVE_HEADERS_ON_COPY YES - XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY YES MACOSX_BUNDLE_BUNDLE_NAME "Voxelotl" MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION}" MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION}"