2014-09-11 14:45:12 +00:00
|
|
|
$OpenBSD: patch-Modules_FindSDL_cmake,v 1.7 2014/09/11 14:45:13 dcoppa Exp $
|
2013-05-30 08:34:32 +00:00
|
|
|
|
2014-09-11 14:45:12 +00:00
|
|
|
Fix CMake warning
|
2013-05-30 08:34:32 +00:00
|
|
|
|
2014-09-11 10:24:38 +00:00
|
|
|
--- Modules/FindSDL.cmake.orig Thu Jul 31 17:03:56 2014
|
|
|
|
|
+++ Modules/FindSDL.cmake Wed Sep 3 08:10:09 2014
|
|
|
|
|
@@ -96,6 +96,11 @@ else()
|
|
|
|
|
set(VC_LIB_PATH_SUFFIX lib/x86)
|
|
|
|
|
endif()
|
2012-05-07 07:06:20 +00:00
|
|
|
|
|
|
|
|
+# On OpenBSD SDL depends on libiconv and SDL_stdinc.h includes iconv.h,
|
2012-11-15 08:43:25 +00:00
|
|
|
+# which is located in ${LOCALBASE}/include. Append ${LOCALBASE}/include
|
2010-05-28 20:21:48 +00:00
|
|
|
+# to the SDL_INCLUDE_DIR, thus allow to build SDL apps out of box.
|
2012-11-11 17:13:31 +00:00
|
|
|
+list(APPEND SDL_INCLUDE_DIR ${LOCALBASE}/include)
|
2010-05-28 20:21:48 +00:00
|
|
|
+
|
|
|
|
|
# SDL-1.1 is the name used by FreeBSD ports...
|
2012-05-07 07:06:20 +00:00
|
|
|
# don't confuse it for the version number.
|
2012-11-11 17:13:31 +00:00
|
|
|
find_library(SDL_LIBRARY_TEMP
|
2014-09-11 10:24:38 +00:00
|
|
|
@@ -106,7 +111,7 @@ find_library(SDL_LIBRARY_TEMP
|
2012-05-07 07:06:20 +00:00
|
|
|
)
|
2010-05-28 20:21:48 +00:00
|
|
|
|
2012-11-11 17:13:31 +00:00
|
|
|
if(NOT SDL_BUILDING_LIBRARY)
|
|
|
|
|
- if(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
|
|
|
|
|
+ if(NOT "${SDL_INCLUDE_DIR}" MATCHES ".framework")
|
|
|
|
|
# Non-OS X framework versions expect you to also dynamically link to
|
|
|
|
|
# SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
|
2010-05-28 20:21:48 +00:00
|
|
|
# seem to provide SDLmain for compatibility even though they don't
|
