8b1b17cff8
"This is good, commit." espie@
34 lines
1.3 KiB
Plaintext
34 lines
1.3 KiB
Plaintext
$OpenBSD: patch-Modules_FindSDL_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
|
|
--- Modules/FindSDL.cmake.orig Tue Apr 6 16:45:31 2010
|
|
+++ Modules/FindSDL.cmake Mon Apr 26 14:10:36 2010
|
|
@@ -81,6 +81,11 @@ FIND_PATH(SDL_INCLUDE_DIR SDL.h
|
|
/opt/csw # Blastwave
|
|
/opt
|
|
)
|
|
+# On OpenBSD SDL depends on libiconv and SDL_stdinc.h includes iconv.h,
|
|
+# which is located in ${LOCALBASE}/include. Append {LOCALBASE}/include
|
|
+# to the SDL_INCLUDE_DIR, thus allow to build SDL apps out of box.
|
|
+LIST(APPEND SDL_INCLUDE_DIR ${LOCALBASE}/include)
|
|
+
|
|
#MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}")
|
|
|
|
# SDL-1.1 is the name used by FreeBSD ports...
|
|
@@ -100,7 +105,7 @@ FIND_LIBRARY(SDL_LIBRARY_TEMP
|
|
#MESSAGE("SDL_LIBRARY_TEMP is ${SDL_LIBRARY_TEMP}")
|
|
|
|
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
|
|
# seem to provide SDLmain for compatibility even though they don't
|
|
@@ -116,7 +121,7 @@ IF(NOT SDL_BUILDING_LIBRARY)
|
|
/opt/csw
|
|
/opt
|
|
)
|
|
- ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework")
|
|
+ ENDIF(NOT "${SDL_INCLUDE_DIR}" MATCHES ".framework")
|
|
ENDIF(NOT SDL_BUILDING_LIBRARY)
|
|
|
|
# SDL may require threads on your system.
|