646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
diff --git a/cmake/macos/compilerconfig.cmake b/cmake/macos/compilerconfig.cmake
|
|
index f0c900f28..4da64f0b3 100644
|
|
--- a/cmake/macos/compilerconfig.cmake
|
|
+++ b/cmake/macos/compilerconfig.cmake
|
|
@@ -25,7 +25,7 @@ function(check_sdk_requirements)
|
|
set(ares_macos_minimum_sdk 11.1) # Minimum tested SDK
|
|
set(ares_macos_minimum_xcode 12.4) # Sync with SDK
|
|
execute_process(
|
|
- COMMAND xcrun --sdk macosx --show-sdk-platform-version
|
|
+ COMMAND echo @sdkVersion@
|
|
OUTPUT_VARIABLE ares_macos_current_sdk
|
|
RESULT_VARIABLE result
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
diff --git a/cmake/macos/helpers.cmake b/cmake/macos/helpers.cmake
|
|
index 3777ac98a..07ff17009 100644
|
|
--- a/cmake/macos/helpers.cmake
|
|
+++ b/cmake/macos/helpers.cmake
|
|
@@ -35,7 +35,6 @@ function(ares_configure_executable target)
|
|
endif()
|
|
endif()
|
|
|
|
- _bundle_dependencies(${target})
|
|
|
|
install(TARGETS ${target} BUNDLE DESTINATION "." COMPONENT Application)
|
|
endif()
|
|
diff --git a/ruby/cmake/os-macos.cmake b/ruby/cmake/os-macos.cmake
|
|
index 39c339428..dafb58c66 100644
|
|
--- a/ruby/cmake/os-macos.cmake
|
|
+++ b/ruby/cmake/os-macos.cmake
|
|
@@ -43,7 +43,7 @@ target_link_libraries(
|
|
if(SDL_FOUND)
|
|
target_link_libraries(
|
|
ruby
|
|
- PRIVATE "$<LINK_LIBRARY:WEAK_FRAMEWORK,SDL::SDL>"
|
|
+ PRIVATE "$<LINK_LIBRARY:WEAK_LIBRARY,SDL::SDL>"
|
|
)
|
|
endif()
|
|
|