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] Give CMakeLists.txt a chance to find libs and add missing libs

compat.4875.patch (text/plain), 1.80 KB, created by Malte Kießling on 2020-12-22 21:47:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Malte Kießling

Created: 2020-12-22 21:47:19 UTC

Size: 1.80 KB

patch

obsolete

>diff -r dc55edfe5d2f CMakeLists.txt
>--- a/CMakeLists.txt	Wed Apr 03 23:37:14 2019 -0400
>+++ b/CMakeLists.txt	Tue Dec 22 22:37:48 2020 +0100
>@@ -3,8 +3,12 @@
> 
> add_library(SDL SHARED "src/SDL12_compat.c")
> 
>-target_include_directories(SDL PUBLIC "/usr/local/include/SDL2")  # !!! FIXME
>-target_include_directories(SDL PUBLIC "/usr/X11/include")  # !!! FIXME
>+find_path(SDL1_INCLUDE_DIR NAMES SDL.h PATH_SUFFIXES include include/SDL SDL) # FIXME this might still confuse the SDL versions...
>+find_path(SDL2_INCLUDE_DIR NAMES SDL_haptic.h PATH_SUFFIXES include include/SDL2 SDL2 REQUIRED)
>+find_path(X11_INCLUDE_DIR NAMES Xlib.h PATH_SUFFIXES include include/X11 include/x11 X11 REQUIRED)
>+
>+target_include_directories(SDL PUBLIC ${SDL2_INCLUDE_DIR})
>+target_include_directories(SDL PUBLIC ${X11_INCLUDE_DIR})
> add_definitions("-D_THREAD_SAFE")  # !!! FIXME
> 
> if(APPLE)
>@@ -31,13 +35,18 @@
>     set_target_properties(SDL PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB")
> endif()
> 
>+if(SDL1_INCLUDE_DIR)
>+    # test programs...
>+    macro(test_program _NAME _SRCS)
>+        add_executable(${_NAME} ${_SRCS})
>+        target_include_directories(${_NAME} PUBLIC ${SDL1_INCLUDE_DIR})
>+        target_include_directories(${_NAME} PUBLIC ${X11_INCLUDE_DIR})
>+        target_link_libraries(${_NAME} SDL)
>+        if (UNIX)
>+            target_link_libraries(${_NAME} m dl)
>+        endif()
>+    endmacro()
> 
>-# test programs...
>-macro(test_program _NAME _SRCS)
>-    add_executable(${_NAME} ${_SRCS})
>-    target_include_directories(${_NAME} PUBLIC "/usr/local/include/SDL")  # !!! FIXME
>-    target_include_directories(${_NAME} PUBLIC "/usr/X11/include")  # !!! FIXME
>-    target_link_libraries(${_NAME} SDL)
>-endmacro()
>+    test_program(testsprite "test/testsprite.c")
> 
>-test_program(testsprite "test/testsprite.c")
>+endif()
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 4875: 4596 | 4597

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.