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] A patch that fixes the CheckCOCOA cmake macro

cmake_cocoa_fix.patch (text/plain), 1.20 KB, created by Jake Kerr on 2013-05-06 02:01:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jake Kerr

Created: 2013-05-06 02:01:40 UTC

Size: 1.20 KB

patch

obsolete

>diff -r e9ed46195235 cmake/macros.cmake
>--- a/cmake/macros.cmake	Sun May 05 21:01:20 2013 -0400
>+++ b/cmake/macros.cmake	Mon May 06 14:55:31 2013 +0900
>@@ -63,3 +63,11 @@
>     set(${_OUTPUT} "${_LPREFIX}${_ITEM} ${${_OUTPUT}}")
>   endforeach()
> endmacro()
>+
>+macro(CHECK_OBJC_SOURCE_COMPILES SOURCE VAR)
>+  set(PREV_REQUIRED_DEFS "${CMAKE_REQUIRED_DEFINITIONS}")
>+  set(CMAKE_REQUIRED_DEFINITIONS "-ObjC ${PREV_REQUIRED_DEFS}")
>+  CHECK_C_SOURCE_COMPILES(${SOURCE} ${VAR})
>+  set(CMAKE_REQUIRED_DEFINITIONS "${PREV_REQUIRED_DEFS}")
>+endmacro()
>+
>diff -r e9ed46195235 cmake/sdlchecks.cmake
>--- a/cmake/sdlchecks.cmake	Sun May 05 21:01:20 2013 -0400
>+++ b/cmake/sdlchecks.cmake	Mon May 06 14:55:31 2013 +0900
>@@ -449,11 +449,12 @@
> #
> macro(CheckCOCOA)
>   if(VIDEO_COCOA)
>-    check_c_source_compiles("
>+    check_objc_source_compiles("
>         #import <Cocoa/Cocoa.h>
>         int main (int argc, char** argv) {}" HAVE_VIDEO_COCOA)
>     if(HAVE_VIDEO_COCOA)
>       file(GLOB COCOA_SOURCES ${SDL2_SOURCE_DIR}/src/video/cocoa/*.m)
>+      set_source_files_properties(${COCOA_SOURCES} PROPERTIES LANGUAGE C)
>       set(SOURCE_FILES ${SOURCE_FILES} ${COCOA_SOURCES})
>       set(SDL_VIDEO_DRIVER_COCOA 1)
>       set(HAVE_SDL_VIDEO TRUE)

Actions: View | Diff

Attachments on bug 1839: 1130

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.