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_image.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_image.cmake')
| -rw-r--r-- | Modules/FindSDL_image.cmake | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/Modules/FindSDL_image.cmake b/Modules/FindSDL_image.cmake index e39b3cb..e2481e1 100644 --- a/Modules/FindSDL_image.cmake +++ b/Modules/FindSDL_image.cmake @@ -13,14 +13,10 @@ # additional Unix paths (FreeBSD, etc). FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h - PATHS + HINTS $ENV{SDLIMAGEDIR} $ENV{SDLDIR} - NO_DEFAULT_PATH PATH_SUFFIXES include -) - -FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h PATHS ~/Library/Frameworks /Library/Frameworks @@ -44,15 +40,10 @@ FIND_PATH(SDLIMAGE_INCLUDE_DIR SDL_image.h FIND_LIBRARY(SDLIMAGE_LIBRARY NAMES SDL_image - PATHS + HINTS $ENV{SDLIMAGEDIR} $ENV{SDLDIR} - NO_DEFAULT_PATH - PATH_SUFFIXES lib64 lib -) - -FIND_LIBRARY(SDLIMAGE_LIBRARY - NAMES SDL_image + PATH_SUFFIXES lib64 lib PATHS ~/Library/Frameworks /Library/Frameworks @@ -62,7 +53,6 @@ FIND_LIBRARY(SDLIMAGE_LIBRARY /opt/local /opt/csw /opt - PATH_SUFFIXES lib64 lib ) SET(SDLIMAGE_FOUND "NO") |