From c7125f37aa5325f84d615eaf3b8fa2e67eb7d800 Mon Sep 17 00:00:00 2001 From: Lectem Date: Thu, 21 Jul 2016 10:28:52 +0200 Subject: [PATCH] Fixes SDL2.dll copy to bindir on windows --- externals/cmake-modules/FindSDL2.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/externals/cmake-modules/FindSDL2.cmake b/externals/cmake-modules/FindSDL2.cmake index 9b8daa0d1..22ce752c5 100644 --- a/externals/cmake-modules/FindSDL2.cmake +++ b/externals/cmake-modules/FindSDL2.cmake @@ -3,6 +3,7 @@ # SDL2_LIBRARY, the name of the library to link against # SDL2_FOUND, if false, do not try to link to SDL2 # SDL2_INCLUDE_DIR, where to find SDL.h +# SDL2_DLL_DIR, where to find SDL2.dll if it exists # # This module responds to the the flag: # SDL2_BUILDING_LIBRARY @@ -149,6 +150,14 @@ FIND_LIBRARY(SDL2_LIBRARY_TEMP ) IF(SDL2_LIBRARY_TEMP) + if(MSVC) + get_filename_component(SDL2_DLL_DIR_TEMP ${SDL2_LIBRARY_TEMP} DIRECTORY) + if(EXISTS ${SDL2_DLL_DIR_TEMP}/SDL2.dll) + set(SDL2_DLL_DIR ${SDL2_DLL_DIR_TEMP}) + unset(SDL2_DLL_DIR_TEMP) + endif() + endif() + FIND_PATH(SDL2_INCLUDE_DIR SDL.h HINTS $ENV{SDL2DIR}