From 9619719882935b9f5bed43079a1ac74f82c09ba1 Mon Sep 17 00:00:00 2001 From: Benjamin Eikel Date: Mon, 11 Nov 2013 22:26:16 +0100 Subject: 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 --- Modules/FindSDL_ttf.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Modules/FindSDL_ttf.cmake') diff --git a/Modules/FindSDL_ttf.cmake b/Modules/FindSDL_ttf.cmake index 8f72b1a41c..3f58ac19ff 100644 --- a/Modules/FindSDL_ttf.cmake +++ b/Modules/FindSDL_ttf.cmake @@ -57,6 +57,12 @@ find_path(SDL_TTF_INCLUDE_DIR SDL_ttf.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_TTF_LIBRARY AND SDLTTF_LIBRARY) set(SDL_TTF_LIBRARY ${SDLTTF_LIBRARY} CACHE FILEPATH "file cache entry initialized from old variable name") @@ -66,7 +72,7 @@ find_library(SDL_TTF_LIBRARY HINTS ENV SDLTTFDIR ENV SDLDIR - PATH_SUFFIXES lib + PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX} ) if(SDL_TTF_INCLUDE_DIR AND EXISTS "${SDL_TTF_INCLUDE_DIR}/SDL_ttf.h") -- cgit v1.2.1