diff --git a/modules/FindSDL2.cmake b/modules/FindSDL2.cmake index b62795969..c51b34ba7 100644 --- a/modules/FindSDL2.cmake +++ b/modules/FindSDL2.cmake @@ -13,6 +13,7 @@ # SDL2_LIBRARY_RELEASE - SDL2 release library, if found # SDL2_INCLUDE_DIR - Root include dir # SDL2_BIN_DIR - Root bin dir +# # # This file is part of Magnum. @@ -78,10 +79,12 @@ else() # the dylib first so it is preferred. Not sure how this maps to debug # config though :/ NAMES SDL2-2.0 SDL2 + HINTS ${SDL2_PATH} PATH_SUFFIXES ${_SDL2_LIBRARY_PATH_SUFFIX}) find_library(SDL2_LIBRARY_DEBUG NAMES SDL2d + HINTS ${SDL2_PATH} PATH_SUFFIXES ${_SDL2_LIBRARY_PATH_SUFFIX}) # FPHSA needs one of the _DEBUG/_RELEASE variables to check that the @@ -103,11 +106,13 @@ find_path(SDL2_INCLUDE_DIR # solve this issue), but rather SDL2.framework/Headers/SDL.h, CMake might # find SDL.framework/Headers/SDL.h if SDL1 is installed, which is wrong. NAMES SDL_scancode.h + HINTS ${SDL2_PATH} PATH_SUFFIXES ${_SDL2_PATH_SUFFIXES}) # Bin dir find_path(SDL2_BIN_DIR - NAMES *.dll + NAMES SDL2.dll + HINTS ${SDL2_PATH} PATH_SUFFIXES ${_SDL2_BIN_PATH_SUFFIX} ${_SDL2_LIBRARY_PATH_SUFFIX}) # iOS dependencies