summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-11-05 14:43:52 (GMT)
committerBrad King <brad.king@kitware.com>2012-11-05 14:47:09 (GMT)
commit7cb5173969bc78bebdf2fe5c0aeb2d54712f8734 (patch)
tree985e7bfec13eaee00f03e0837010b43948fdc1a7 /Modules
parent68c6b134d0d994cacda7aa3cb92e930df42d6e23 (diff)
downloadCMake-7cb5173969bc78bebdf2fe5c0aeb2d54712f8734.zip
CMake-7cb5173969bc78bebdf2fe5c0aeb2d54712f8734.tar.gz
CMake-7cb5173969bc78bebdf2fe5c0aeb2d54712f8734.tar.bz2
FindSDL: Restore accidentally dropped search paths (#13651)
Cleanup in commit 9ed24c53 (FindSDL: Remove from find_... calls PATHS that are set by default, 2012-09-04) accidentally dropped some search paths. Restore the dropped PATH_SUFFIXES and add more suffixes needed to search paths that were previously hard-coded. Reported-by: Gino van den Bergen <gino@dtecta.com>
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindSDL.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index 5cc219f..ef28314 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -70,7 +70,7 @@
find_path(SDL_INCLUDE_DIR SDL.h
HINTS
ENV SDLDIR
- PATH_SUFFIXES SDL SDL12 SDL11
+ PATH_SUFFIXES include/SDL include/SDL12 include/SDL11 include
)
# SDL-1.1 is the name used by FreeBSD ports...
@@ -79,6 +79,7 @@ find_library(SDL_LIBRARY_TEMP
NAMES SDL SDL-1.1
HINTS
ENV SDLDIR
+ PATH_SUFFIXES lib
)
if(NOT SDL_BUILDING_LIBRARY)