summaryrefslogtreecommitdiffstats
path: root/Modules/FindSDL.cmake
diff options
context:
space:
mode:
authorPhilip Lowman <philip@yhbt.com>2009-07-18 05:05:04 (GMT)
committerPhilip Lowman <philip@yhbt.com>2009-07-18 05:05:04 (GMT)
commit1c794c04386994b0f48d6829785e778aad1d97d1 (patch)
treeb23ddc4532a54a6a1f30f579bb90cc55e8dceb80 /Modules/FindSDL.cmake
parentcff19fc2dc19b6bbcb9008eb8b283e49ba35ee17 (diff)
downloadCMake-1c794c04386994b0f48d6829785e778aad1d97d1.zip
CMake-1c794c04386994b0f48d6829785e778aad1d97d1.tar.gz
CMake-1c794c04386994b0f48d6829785e778aad1d97d1.tar.bz2
BUG: Fix include path detection with SDLDIR env var (issue #9086).
Also removed some superfluous search paths.
Diffstat (limited to 'Modules/FindSDL.cmake')
-rw-r--r--Modules/FindSDL.cmake22
1 files changed, 5 insertions, 17 deletions
diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index ee880a6..635a02e 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -55,26 +55,18 @@
FIND_PATH(SDL_INCLUDE_DIR SDL.h
HINTS
$ENV{SDLDIR}
- PATH_SUFFIXES include
+ PATH_SUFFIXES include/SDL include
PATHS
~/Library/Frameworks
/Library/Frameworks
- /usr/local/include/SDL
- /usr/include/SDL
/usr/local/include/SDL12
/usr/local/include/SDL11 # FreeBSD ports
/usr/include/SDL12
/usr/include/SDL11
- /usr/local/include
- /usr/include
- /sw/include/SDL # Fink
- /sw/include
- /opt/local/include/SDL # DarwinPorts
- /opt/local/include
- /opt/csw/include/SDL # Blastwave
- /opt/csw/include
- /opt/include/SDL
- /opt/include
+ /sw # Fink
+ /opt/local # DarwinPorts
+ /opt/csw # Blastwave
+ /opt
)
#MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}")
@@ -86,8 +78,6 @@ FIND_LIBRARY(SDL_LIBRARY_TEMP
$ENV{SDLDIR}
PATH_SUFFIXES lib64 lib
PATHS
- /usr/local
- /usr
/sw
/opt/local
/opt/csw
@@ -108,8 +98,6 @@ IF(NOT SDL_BUILDING_LIBRARY)
$ENV{SDLDIR}
PATH_SUFFIXES lib64 lib
PATHS
- /usr/local
- /usr
/sw
/opt/local
/opt/csw