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/FindGIF.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/FindGIF.cmake')
| -rw-r--r-- | Modules/FindGIF.cmake | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake index 305be68..1d3a5ec 100644 --- a/Modules/FindGIF.cmake +++ b/Modules/FindGIF.cmake @@ -10,15 +10,9 @@ # Modifications by Alexander Neundorf FIND_PATH(GIF_INCLUDE_DIR gif_lib.h - PATHS + HINTS $ENV{GIF_DIR} - NO_DEFAULT_PATH PATH_SUFFIXES include -) - - - -FIND_PATH(GIF_INCLUDE_DIR gif_lib.h PATHS ~/Library/Frameworks /Library/Frameworks @@ -32,16 +26,9 @@ SET(POTENTIAL_GIF_LIBS gif libgif ungif libungif giflib) FIND_LIBRARY(GIF_LIBRARY NAMES ${POTENTIAL_GIF_LIBS} - PATHS + HINTS $ENV{GIF_DIR} - NO_DEFAULT_PATH PATH_SUFFIXES lib64 lib -) - - - -FIND_LIBRARY(GIF_LIBRARY - NAMES ${POTENTIAL_GIF_LIBS} PATHS ~/Library/Frameworks /Library/Frameworks @@ -53,7 +40,6 @@ FIND_LIBRARY(GIF_LIBRARY /opt [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT] /usr/freeware - PATH_SUFFIXES lib64 lib ) # see readme.txt |