diff options
| author | Brad King <brad.king@kitware.com> | 2008-06-09 20:04:06 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-06-09 20:04:06 (GMT) |
| commit | e2ec3b671b3753da42df167ba1a4e496d08b5ce2 (patch) | |
| tree | fe2cea51ff2d1d1e681483a4bdad911fea88457c /Modules/FindSDL.cmake | |
| parent | 05434489079708e9896d03b7fc9153ded1d960b4 (diff) | |
| download | CMake-e2ec3b671b3753da42df167ba1a4e496d08b5ce2.zip CMake-e2ec3b671b3753da42df167ba1a4e496d08b5ce2.tar.gz CMake-e2ec3b671b3753da42df167ba1a4e496d08b5ce2.tar.bz2 | |
ENH: Cleanup Find* modules with new HINTS feature
- The find_* commands now provide a HINTS option.
- The option specifies paths to be preferred over the system paths.
- Many Find* modules were using two find calls with NO_DEFAULT_PATH
to approximate the behavior, but that blocked users from overriding
things with CMAKE_PREFIX_PATH.
- This commit uses the HINTS feature to get desired behavior in
only one find command call.
Diffstat (limited to 'Modules/FindSDL.cmake')
| -rw-r--r-- | Modules/FindSDL.cmake | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake index 75b42cc..ee880a6 100644 --- a/Modules/FindSDL.cmake +++ b/Modules/FindSDL.cmake @@ -53,13 +53,9 @@ # reasons because not all systems place things in SDL/ (see FreeBSD). FIND_PATH(SDL_INCLUDE_DIR SDL.h - PATHS + HINTS $ENV{SDLDIR} - NO_DEFAULT_PATH PATH_SUFFIXES include -) - -FIND_PATH(SDL_INCLUDE_DIR SDL.h PATHS ~/Library/Frameworks /Library/Frameworks @@ -86,14 +82,9 @@ FIND_PATH(SDL_INCLUDE_DIR SDL.h # don't confuse it for the version number. FIND_LIBRARY(SDL_LIBRARY_TEMP NAMES SDL SDL-1.1 - PATHS + HINTS $ENV{SDLDIR} - NO_DEFAULT_PATH - PATH_SUFFIXES lib64 lib -) - -FIND_LIBRARY(SDL_LIBRARY_TEMP - NAMES SDL SDL-1.1 + PATH_SUFFIXES lib64 lib PATHS /usr/local /usr @@ -101,7 +92,6 @@ FIND_LIBRARY(SDL_LIBRARY_TEMP /opt/local /opt/csw /opt - PATH_SUFFIXES lib64 lib ) #MESSAGE("SDL_LIBRARY_TEMP is ${SDL_LIBRARY_TEMP}") @@ -114,14 +104,9 @@ IF(NOT SDL_BUILDING_LIBRARY) # necessarily need it. FIND_LIBRARY(SDLMAIN_LIBRARY NAMES SDLmain SDLmain-1.1 - PATHS + HINTS $ENV{SDLDIR} - NO_DEFAULT_PATH PATH_SUFFIXES lib64 lib - ) - - FIND_LIBRARY(SDLMAIN_LIBRARY - NAMES SDLmain SDLmain-1.1 PATHS /usr/local /usr @@ -129,7 +114,6 @@ IF(NOT SDL_BUILDING_LIBRARY) /opt/local /opt/csw /opt - PATH_SUFFIXES lib64 lib ) ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework") ENDIF(NOT SDL_BUILDING_LIBRARY) |