Browse Source

Expose SDL2_BIN_DIR on FindSDL2.cmake

pull/347/head
Ivan Sanz Carasa 7 years ago committed by GitHub
parent
commit
39ee2839d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      modules/FindSDL2.cmake

11
modules/FindSDL2.cmake

@ -12,7 +12,7 @@
# SDL2_LIBRARY_DEBUG - SDL2 debug library, if found # SDL2_LIBRARY_DEBUG - SDL2 debug library, if found
# SDL2_LIBRARY_RELEASE - SDL2 release library, if found # SDL2_LIBRARY_RELEASE - SDL2 release library, if found
# SDL2_INCLUDE_DIR - Root include dir # SDL2_INCLUDE_DIR - Root include dir
# # SDL2_BIN_DIR - Root bin dir
# #
# This file is part of Magnum. # This file is part of Magnum.
@ -62,9 +62,11 @@ else()
elseif(MINGW) elseif(MINGW)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(_SDL2_LIBRARY_PATH_SUFFIX x86_64-w64-mingw32/lib) set(_SDL2_LIBRARY_PATH_SUFFIX x86_64-w64-mingw32/lib)
set(_SDL2_BIN_PATH_SUFFIX x86_64-w64-mingw32/bin)
list(APPEND _SDL2_PATH_SUFFIXES x86_64-w64-mingw32/include/SDL2) list(APPEND _SDL2_PATH_SUFFIXES x86_64-w64-mingw32/include/SDL2)
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(_SDL2_LIBRARY_PATH_SUFFIX i686-w64-mingw32/lib) set(_SDL2_LIBRARY_PATH_SUFFIX i686-w64-mingw32/lib)
set(_SDL2_BIN_PATH_SUFFIX i686-w64-mingw32/bin)
list(APPEND _SDL2_PATH_SUFFIXES i686-w64-mingw32/include/SDL2) list(APPEND _SDL2_PATH_SUFFIXES i686-w64-mingw32/include/SDL2)
endif() endif()
endif() endif()
@ -77,9 +79,11 @@ else()
# config though :/ # config though :/
NAMES SDL2-2.0 SDL2 NAMES SDL2-2.0 SDL2
PATH_SUFFIXES ${_SDL2_LIBRARY_PATH_SUFFIX}) PATH_SUFFIXES ${_SDL2_LIBRARY_PATH_SUFFIX})
find_library(SDL2_LIBRARY_DEBUG find_library(SDL2_LIBRARY_DEBUG
NAMES SDL2d NAMES SDL2d
PATH_SUFFIXES ${_SDL2_LIBRARY_PATH_SUFFIX}) PATH_SUFFIXES ${_SDL2_LIBRARY_PATH_SUFFIX})
# FPHSA needs one of the _DEBUG/_RELEASE variables to check that the # FPHSA needs one of the _DEBUG/_RELEASE variables to check that the
# library was found -- using SDL_LIBRARY, which will get populated by # library was found -- using SDL_LIBRARY, which will get populated by
# select_library_configurations() below. # select_library_configurations() below.
@ -101,6 +105,11 @@ find_path(SDL2_INCLUDE_DIR
NAMES SDL_scancode.h NAMES SDL_scancode.h
PATH_SUFFIXES ${_SDL2_PATH_SUFFIXES}) PATH_SUFFIXES ${_SDL2_PATH_SUFFIXES})
# Bin dir
find_path(SDL2_BIN_DIR
NAMES *.dll
PATH_SUFFIXES ${_SDL2_BIN_PATH_SUFFIX} ${_SDL2_LIBRARY_PATH_SUFFIX})
# iOS dependencies # iOS dependencies
if(CORRADE_TARGET_IOS) if(CORRADE_TARGET_IOS)
set(_SDL2_FRAMEWORKS set(_SDL2_FRAMEWORKS

Loading…
Cancel
Save