summaryrefslogtreecommitdiffstats
path: root/Modules/FindSDL_mixer.cmake
diff options
context:
space:
mode:
authorBenjamin Eikel <cmake@eikel.org>2013-11-11 21:26:16 (GMT)
committerBrad King <brad.king@kitware.com>2013-11-21 20:30:36 (GMT)
commit9619719882935b9f5bed43079a1ac74f82c09ba1 (patch)
treecd91bdfd0321e3eabaf25a342ccead0a1123f467 /Modules/FindSDL_mixer.cmake
parent13da9f00245694d3dee9f4c9b245f0e3941284c5 (diff)
downloadCMake-9619719882935b9f5bed43079a1ac74f82c09ba1.zip
CMake-9619719882935b9f5bed43079a1ac74f82c09ba1.tar.gz
CMake-9619719882935b9f5bed43079a1ac74f82c09ba1.tar.bz2
FindSDL: Add additional search paths on MSVC (#14029)
Add an architecture-specific library directory path suffix for each component. Use different search path for SDL_sound. Project files in VisualC directory suggest that a win32lib will hold the libraries. Reported-by: Paul Hampson <Paul.Hampson@Pobox.com>
Diffstat (limited to 'Modules/FindSDL_mixer.cmake')
-rw-r--r--Modules/FindSDL_mixer.cmake8
1 files changed, 7 insertions, 1 deletions
diff --git a/Modules/FindSDL_mixer.cmake b/Modules/FindSDL_mixer.cmake
index d17c907..8f2f066 100644
--- a/Modules/FindSDL_mixer.cmake
+++ b/Modules/FindSDL_mixer.cmake
@@ -57,6 +57,12 @@ find_path(SDL_MIXER_INCLUDE_DIR SDL_mixer.h
PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(VC_LIB_PATH_SUFFIX lib/x64)
+else()
+ set(VC_LIB_PATH_SUFFIX lib/x86)
+endif()
+
if(NOT SDL_MIXER_LIBRARY AND SDLMIXER_LIBRARY)
set(SDL_MIXER_LIBRARY ${SDLMIXER_LIBRARY} CACHE FILEPATH "file cache entry
initialized from old variable name")
@@ -66,7 +72,7 @@ find_library(SDL_MIXER_LIBRARY
HINTS
ENV SDLMIXERDIR
ENV SDLDIR
- PATH_SUFFIXES lib
+ PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
)
if(SDL_MIXER_INCLUDE_DIR AND EXISTS "${SDL_MIXER_INCLUDE_DIR}/SDL_mixer.h")