Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:58:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ensure dll path is found for sdl2

Browse source
This commit is contained in:
Stephen Birarda 2015-02-17 15:27:12 -08:00
parent e582709185
commit ecbbb481d0
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmake/modules/FindSDL2.cmake
View file

@ -138,6 +138,10 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
/opt/csw /opt/csw
/opt /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 # On 32bit build find the 32bit libs
ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8) ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
FIND_LIBRARY(SDL2_LIBRARY_TEMP SDL2 FIND_LIBRARY(SDL2_LIBRARY_TEMP SDL2
@ -153,6 +157,10 @@ ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
/opt/csw /opt/csw
/opt /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) ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
IF(NOT SDL2_BUILDING_LIBRARY) IF(NOT SDL2_BUILDING_LIBRARY)
@ -253,9 +261,13 @@ ENDIF(SDL2_LIBRARY_TEMP)
INCLUDE(FindPackageHandleStandardArgs) 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) if (WIN32)
get_filename_component(SDL2_DLL_PATH ${SDL2_LIBRARY} DIRECTORY CACHE) add_paths_to_lib_paths(${SDL2_DLL_PATH})
add_paths_to_lib_paths(${SDL2_DLL_PATH} ${SDL2_RELEASE_PATH})
endif () endif ()