From 2fa6c445cb5063805b5cfe64c7da80f5c0a533ba Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Mon, 29 Jul 2024 17:42:53 -0600 Subject: [PATCH] CMake: Work around two upstream CMake issues for Swift files https://gitlab.kitware.com/cmake/cmake/-/issues/26174 https://gitlab.kitware.com/cmake/cmake/-/issues/26175 --- Meta/CMake/Swift/swift-settings.cmake | 5 +++++ Userland/Libraries/LibGfx/CMakeLists.txt | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/Meta/CMake/Swift/swift-settings.cmake b/Meta/CMake/Swift/swift-settings.cmake index 36cef4a9483..7aa3eabc59b 100644 --- a/Meta/CMake/Swift/swift-settings.cmake +++ b/Meta/CMake/Swift/swift-settings.cmake @@ -17,3 +17,8 @@ include(${CMAKE_CURRENT_LIST_DIR}/InitializeSwift.cmake) include(${CMAKE_CURRENT_LIST_DIR}/GenerateSwiftHeader.cmake) add_compile_options("SHELL:$<$:-Xcc -std=c++23 -cxx-interoperability-mode=default>") + +# FIXME: https://gitlab.kitware.com/cmake/cmake/-/issues/26174 +if (APPLE) + set(CMAKE_Swift_COMPILER_TARGET "${CMAKE_SYSTEM_PROCESSOR}-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}") +endif() diff --git a/Userland/Libraries/LibGfx/CMakeLists.txt b/Userland/Libraries/LibGfx/CMakeLists.txt index 3ce2c15df36..a707d6696ce 100644 --- a/Userland/Libraries/LibGfx/CMakeLists.txt +++ b/Userland/Libraries/LibGfx/CMakeLists.txt @@ -119,4 +119,11 @@ if (ENABLE_SWIFT) _swift_generate_cxx_header(LibGfx "LibGfx-Swift.h" SEARCH_PATHS ${LIBGFX_NATIVE_DIRS} ) + + # FIXME: https://gitlab.kitware.com/cmake/cmake/-/issues/26175 + if (APPLE) + add_custom_command(TARGET LibGfx POST_BUILD + COMMAND install_name_tool -id @rpath/liblagom-gfx.0.dylib "$" + ) + endif() endif()