mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-25 22:25:46 +00:00
Code Issues Releases Wiki Activity

Port FindSDL2.cmake to actually find SDL2 rather than SDL, and include it in CMakeLists.txt

Browse source 
(following instructions at http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries)
This commit is contained in:
Sam S 2013-07-19 15:23:01 +02:00 committed by fgenesis
parent 7511794153
commit 4ef6786886
2 changed files with 61 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -164,7 +164,13 @@ endif(NOT OGGVORBIS_FOUND)
OPTION(AQUARIA_INTERNAL_SDL "Always use included SDL library" ${WIN32_TRUE}) OPTION(AQUARIA_INTERNAL_SDL "Always use included SDL library" ${WIN32_TRUE})
if(NOT AQUARIA_INTERNAL_SDL) if(NOT AQUARIA_INTERNAL_SDL)
if(AQUARIA_USE_SDL2) if(AQUARIA_USE_SDL2)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
find_package(SDL2) find_package(SDL2)
if(SDL2_FOUND)
set(SDL_FOUND TRUE)
set(SDL_INCLUDE_DIR ${SDL2_INCLUDE_DIR})
set(SDL_LIBRARY ${SDL2_LIBRARY})
endif(SDL2_FOUND)
else(AQUARIA_USE_SDL2) else(AQUARIA_USE_SDL2)
find_package(SDL) find_package(SDL)
endif(AQUARIA_USE_SDL2) endif(AQUARIA_USE_SDL2)

107
cmake/Modules/FindSDL2.cmake
View file

@ -1,36 +1,36 @@
# - Locate SDL library # - Locate SDL2 library
# This module defines # This module defines
# SDL_LIBRARY, the name of the library to link against # SDL2_LIBRARY, the name of the library to link against
# SDL_FOUND, if false, do not try to link to SDL # SDL2_FOUND, if false, do not try to link to SDL
# SDL_INCLUDE_DIR, where to find SDL.h # SDL2_INCLUDE_DIR, where to find SDL.h
# SDL_VERSION_STRING, human-readable string containing the version of SDL # SDL2_VERSION_STRING, human-readable string containing the version of SDL2
# #
# This module responds to the the flag: # This module responds to the the flag:
# SDL_BUILDING_LIBRARY # SDL2_BUILDING_LIBRARY
# If this is defined, then no SDL_main will be linked in because # If this is defined, then no SDL2_main will be linked in because
# only applications need main(). # only applications need main().
# Otherwise, it is assumed you are building an application and this # Otherwise, it is assumed you are building an application and this
# module will attempt to locate and set the the proper link flags # module will attempt to locate and set the the proper link flags
# as part of the returned SDL_LIBRARY variable. # as part of the returned SDL2_LIBRARY variable.
# #
# Don't forget to include SDLmain.h and SDLmain.m your project for the # Don't forget to include SDL2main.h and SDL2main.m your project for the
# OS X framework based version. (Other versions link to -lSDLmain which # OS X framework based version. (Other versions link to -lSDL2main which
# this module will try to find on your behalf.) Also for OS X, this # this module will try to find on your behalf.) Also for OS X, this
# module will automatically add the -framework Cocoa on your behalf. # module will automatically add the -framework Cocoa on your behalf.
# #
# #
# Additional Note: If you see an empty SDL_LIBRARY_TEMP in your configuration # Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
# and no SDL_LIBRARY, it means CMake did not find your SDL library # and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
# (SDL.dll, libsdl.so, SDL.framework, etc). # (SDL2.dll, libsdl2.so, SDL2.framework, etc).
# Set SDL_LIBRARY_TEMP to point to your SDL library, and configure again. # Set SDL2_LIBRARY_TEMP to point to your SDL library, and configure again.
# Similarly, if you see an empty SDLMAIN_LIBRARY, you should set this value # Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
# as appropriate. These values are used to generate the final SDL_LIBRARY # as appropriate. These values are used to generate the final SDL2_LIBRARY
# variable, but when these values are unset, SDL_LIBRARY does not get created. # variable, but when these values are unset, SDL2_LIBRARY does not get created.
# #
# #
# $SDLDIR is an environment variable that would # $SDL2DIR is an environment variable that would
# correspond to the ./configure --prefix=$SDLDIR # correspond to the ./configure --prefix=$SDL2DIR
# used in building SDL. # used in building SDL2.
# l.e.galup 9-20-02 # l.e.galup 9-20-02
# #
# Modified by Eric Wing. # Modified by Eric Wing.
@ -43,9 +43,12 @@
# Added a search for threads which is needed by some platforms. # Added a search for threads which is needed by some platforms.
# Added needed compile switches for MinGW. # Added needed compile switches for MinGW.
# #
# Modified for use in Aquaria:
# Ported to SDL2.
#
# On OSX, this will prefer the Framework version (if found) over others. # On OSX, this will prefer the Framework version (if found) over others.
# People will have to manually change the cache values of # People will have to manually change the cache values of
# SDL_LIBRARY to override this selection or set the CMake environment # SDL2_LIBRARY to override this selection or set the CMake environment
# CMAKE_INCLUDE_PATH to modify the search paths. # CMAKE_INCLUDE_PATH to modify the search paths.
# #
# Note that the header path has changed from SDL/SDL.h to just SDL.h # Note that the header path has changed from SDL/SDL.h to just SDL.h
@ -67,31 +70,31 @@
# (To distribute this file outside of CMake, substitute the full # (To distribute this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
find_path(SDL_INCLUDE_DIR SDL.h find_path(SDL2_INCLUDE_DIR SDL.h
HINTS HINTS
ENV SDLDIR ENV SDL2DIR
PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include PATH_SUFFIXES include/SDL2 include
) )
# SDL-1.1 is the name used by FreeBSD ports... # SDL-1.1 is the name used by FreeBSD ports...
# don't confuse it for the version number. # don't confuse it for the version number.
find_library(SDL_LIBRARY_TEMP find_library(SDL2_LIBRARY_TEMP
NAMES SDL SDL-1.1 NAMES SDL2 # SDL-1.1
HINTS HINTS
ENV SDLDIR ENV SDL2DIR
PATH_SUFFIXES lib PATH_SUFFIXES lib
) )
if(NOT SDL_BUILDING_LIBRARY) if(NOT SDL2_BUILDING_LIBRARY)
if(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework") if(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
# Non-OS X framework versions expect you to also dynamically link to # Non-OS X framework versions expect you to also dynamically link to
# SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms # SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
# seem to provide SDLmain for compatibility even though they don't # seem to provide SDLmain for compatibility even though they don't
# necessarily need it. # necessarily need it.
find_library(SDLMAIN_LIBRARY find_library(SDL2MAIN_LIBRARY
NAMES SDLmain SDLmain-1.1 NAMES SDL2main # SDLmain-1.1
HINTS HINTS
ENV SDLDIR ENV SDL2DIR
PATH_SUFFIXES lib PATH_SUFFIXES lib
PATHS PATHS
/sw /sw
@ -117,14 +120,14 @@ if(MINGW)
set(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW") set(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
endif() endif()
if(SDL_LIBRARY_TEMP) if(SDL2_LIBRARY_TEMP)
# For SDLmain # For SDLmain
if(SDLMAIN_LIBRARY AND NOT SDL_BUILDING_LIBRARY) if(SDL2MAIN_LIBRARY AND NOT SDL2_BUILDING_LIBRARY)
list(FIND SDL_LIBRARY_TEMP "${SDLMAIN_LIBRARY}" _SDL_MAIN_INDEX) list(FIND SDL2_LIBRARY_TEMP "${SDL2MAIN_LIBRARY}" _SDL2_MAIN_INDEX)
if(_SDL_MAIN_INDEX EQUAL -1) if(_SDL2_MAIN_INDEX EQUAL -1)
set(SDL_LIBRARY_TEMP "${SDLMAIN_LIBRARY}" ${SDL_LIBRARY_TEMP}) set(SDL2_LIBRARY_TEMP "${SDL2MAIN_LIBRARY}" ${SDL2_LIBRARY_TEMP})
endif() endif()
unset(_SDL_MAIN_INDEX) unset(_SDL2_MAIN_INDEX)
endif() endif()
# For OS X, SDL uses Cocoa as a backend so it must link to Cocoa. # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
@ -134,35 +137,35 @@ if(SDL_LIBRARY_TEMP)
# So I use a temporary variable until the end so I can set the # So I use a temporary variable until the end so I can set the
# "real" variable in one-shot. # "real" variable in one-shot.
if(APPLE) if(APPLE)
set(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} "-framework Cocoa") set(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
endif() endif()
# For threads, as mentioned Apple doesn't need this. # For threads, as mentioned Apple doesn't need this.
# In fact, there seems to be a problem if I used the Threads package # In fact, there seems to be a problem if I used the Threads package
# and try using this line, so I'm just skipping it entirely for OS X. # and try using this line, so I'm just skipping it entirely for OS X.
if(NOT APPLE) if(NOT APPLE)
set(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT}) set(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
endif() endif()
# For MinGW library # For MinGW library
if(MINGW) if(MINGW)
set(SDL_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL_LIBRARY_TEMP}) set(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
endif() endif()
# Set the final string here so the GUI reflects the final state. # Set the final string here so the GUI reflects the final state.
set(SDL_LIBRARY ${SDL_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found") set(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found")
# Set the temp variable to INTERNAL so it is not seen in the CMake GUI # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
set(SDL_LIBRARY_TEMP "${SDL_LIBRARY_TEMP}" CACHE INTERNAL "") set(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
endif() endif()
if(SDL_INCLUDE_DIR AND EXISTS "${SDL_INCLUDE_DIR}/SDL_version.h") if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h")
file(STRINGS "${SDL_INCLUDE_DIR}/SDL_version.h" SDL_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$") file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$")
file(STRINGS "${SDL_INCLUDE_DIR}/SDL_version.h" SDL_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$") file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$")
file(STRINGS "${SDL_INCLUDE_DIR}/SDL_version.h" SDL_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$") file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$")
string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL_VERSION_MAJOR "${SDL_VERSION_MAJOR_LINE}") string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL_VERSION_MAJOR "${SDL_VERSION_MAJOR_LINE}")
string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL_VERSION_MINOR "${SDL_VERSION_MINOR_LINE}") string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL_VERSION_MINOR "${SDL_VERSION_MINOR_LINE}")
string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL_VERSION_PATCH "${SDL_VERSION_PATCH_LINE}") string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL_VERSION_PATCH "${SDL_VERSION_PATCH_LINE}")
set(SDL_VERSION_STRING ${SDL_VERSION_MAJOR}.${SDL_VERSION_MINOR}.${SDL_VERSION_PATCH}) set(SDL2_VERSION_STRING ${SDL_VERSION_MAJOR}.${SDL_VERSION_MINOR}.${SDL_VERSION_PATCH})
unset(SDL_VERSION_MAJOR_LINE) unset(SDL_VERSION_MAJOR_LINE)
unset(SDL_VERSION_MINOR_LINE) unset(SDL_VERSION_MINOR_LINE)
unset(SDL_VERSION_PATCH_LINE) unset(SDL_VERSION_PATCH_LINE)
@ -171,8 +174,8 @@ if(SDL_INCLUDE_DIR AND EXISTS "${SDL_INCLUDE_DIR}/SDL_version.h")
unset(SDL_VERSION_PATCH) unset(SDL_VERSION_PATCH)
endif() endif()
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
REQUIRED_VARS SDL_LIBRARY SDL_INCLUDE_DIR REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR
VERSION_VAR SDL_VERSION_STRING) VERSION_VAR SDL2_VERSION_STRING)