From ecbbb481d01329be9c9d684ebe508ad56d3d05b9 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 17 Feb 2015 15:27:12 -0800
Subject: [PATCH] ensure dll path is found for sdl2

---
 cmake/modules/FindSDL2.cmake | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/cmake/modules/FindSDL2.cmake b/cmake/modules/FindSDL2.cmake
index d9fa3c3c37..b42cacb16a 100644
--- a/cmake/modules/FindSDL2.cmake
+++ b/cmake/modules/FindSDL2.cmake
@@ -138,6 +138,10 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
 		/opt/csw
 		/opt
 	)
+  
+  if (WIN32)
+    find_path(SDL2_DLL_PATH SDL2.dll PATH_SUFFIXES lib/x64 HINTS ${SDL2_SEARCH_DIRS})
+  endif ()
 # On 32bit build find the 32bit libs
 ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	FIND_LIBRARY(SDL2_LIBRARY_TEMP SDL2
@@ -153,6 +157,10 @@ ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
 		/opt/csw
 		/opt
 	)
+  
+  if (WIN32)
+    find_path(SDL2_DLL_PATH SDL2.dll PATH_SUFFIXES lib/x86 HINTS ${SDL2_SEARCH_DIRS})
+  endif ()
 ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
 
 IF(NOT SDL2_BUILDING_LIBRARY)
@@ -253,9 +261,13 @@ ENDIF(SDL2_LIBRARY_TEMP)
 
 INCLUDE(FindPackageHandleStandardArgs)
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
+set(SDL2_REQUIREMENTS SDL2_LIBRARY SDL2_INCLUDE_DIR)
+if (WIN32)
+  list(APPEND SDL2_REQUIREMENTS SDL2_DLL_PATH)
+endif ()
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_REQUIREMENTS)
 
 if (WIN32)
-  get_filename_component(SDL2_DLL_PATH ${SDL2_LIBRARY} DIRECTORY CACHE)
-  add_paths_to_lib_paths(${SDL2_DLL_PATH} ${SDL2_RELEASE_PATH})
+  add_paths_to_lib_paths(${SDL2_DLL_PATH})
 endif ()