diff options
| author | Brad King <brad.king@kitware.com> | 2008-06-09 16:04:06 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-06-09 16:04:06 -0400 |
| commit | e2ec3b671b3753da42df167ba1a4e496d08b5ce2 (patch) | |
| tree | fe2cea51ff2d1d1e681483a4bdad911fea88457c /Modules/FindSDL_sound.cmake | |
| parent | 05434489079708e9896d03b7fc9153ded1d960b4 (diff) | |
| download | cmake-e2ec3b671b3753da42df167ba1a4e496d08b5ce2.tar.gz | |
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_sound.cmake')
| -rw-r--r-- | Modules/FindSDL_sound.cmake | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Modules/FindSDL_sound.cmake b/Modules/FindSDL_sound.cmake index 71d7334cee..21d6b1c7d8 100644 --- a/Modules/FindSDL_sound.cmake +++ b/Modules/FindSDL_sound.cmake @@ -62,16 +62,12 @@ MARK_AS_ADVANCED(SDL_SOUND_EXTRAS) # Find SDL_sound.h FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h + HINTS $ENV{SDLSOUNDDIR}/include $ENV{SDLSOUNDDIR} $ENV{SDLDIR}/include $ENV{SDLDIR} - NO_DEFAULT_PATH -) -FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h - NO_DEFAULT_PATH -) -FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h + PATHS /usr/local/include/SDL /usr/include/SDL /usr/local/include/SDL12 @@ -92,11 +88,12 @@ FIND_PATH(SDL_SOUND_INCLUDE_DIR SDL_sound.h FIND_LIBRARY(SDL_SOUND_LIBRARY NAMES SDL_sound - PATHS + HINTS $ENV{SDLSOUNDDIR}/lib $ENV{SDLSOUNDDIR} $ENV{SDLDIR}/lib $ENV{SDLDIR} + PATHS /usr/local/lib /usr/lib /sw/lib |