We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

Patch 2 - Apply to 4eb049c9bb1ca94efe3c40b57beda3169984d0cb

patch 2 - apply to 4eb049c9bb1ca94efe3c40b57beda3169984d0cb (text/plain), 1.09 KB, created by Tom Seddon on 2020-12-09 14:01:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Seddon

Created: 2020-12-09 14:01:22 UTC

Size: 1.09 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index fd8d68876..75f0807a0 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -32,7 +32,6 @@ include(CheckIncludeFiles)
> include(CheckIncludeFile)
> include(CheckSymbolExists)
> include(CheckCSourceCompiles)
>-include(CheckOBJCSourceCompiles)
> include(CheckCSourceRuns)
> include(CheckCCompilerFlag)
> include(CheckTypeSize)
>@@ -1802,7 +1801,9 @@ elseif(APPLE)
>     endif()
> 
>     if(VIDEO_VULKAN OR VIDEO_METAL OR RENDER_METAL)
>-      check_objc_source_compiles("
>+      set(ORIG_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
>+      set(CMAKE_REQUIRED_FLAGS "-x objective-c ${CMAKE_REQUIRED_FLAGS}")
>+      check_c_source_compiles("
>         #include <AvailabilityMacros.h>
>         #import <Metal/Metal.h>
>         #import <QuartzCore/CAMetalLayer.h>
>@@ -1812,8 +1813,10 @@ elseif(APPLE)
>         #endif
>         int main()
>         {
>+            return 0;
>         }
>         " HAVE_FRAMEWORK_METAL)
>+      set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS})
>       if(HAVE_FRAMEWORK_METAL)
>         set(SDL_FRAMEWORK_METAL 1)
>         set(SDL_FRAMEWORK_QUARTZCORE 1)

Actions: View

Attachments on bug 5366: 4543 | 4558

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.