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/FindGDAL.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/FindGDAL.cmake')
| -rw-r--r-- | Modules/FindGDAL.cmake | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/Modules/FindGDAL.cmake b/Modules/FindGDAL.cmake index a92b04c..e21fe83 100644 --- a/Modules/FindGDAL.cmake +++ b/Modules/FindGDAL.cmake @@ -20,14 +20,9 @@ # #include "gdal.h" FIND_PATH(GDAL_INCLUDE_DIR gdal.h + HINTS $ENV{GDAL_DIR} - NO_DEFAULT_PATH - PATH_SUFFIXES include -) - - - -FIND_PATH(GDAL_INCLUDE_DIR gdal.h + PATH_SUFFIXES include PATHS ~/Library/Frameworks/gdal.framework/Headers /Library/Frameworks/gdal.framework/Headers @@ -53,14 +48,9 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h FIND_LIBRARY(GDAL_LIBRARY NAMES gdal GDAL - PATHS + HINTS $ENV{GDAL_DIR} - NO_DEFAULT_PATH PATH_SUFFIXES lib64 lib -) - -FIND_LIBRARY(GDAL_LIBRARY - NAMES gdal GDAL PATHS ~/Library/Frameworks /Library/Frameworks @@ -72,7 +62,6 @@ FIND_LIBRARY(GDAL_LIBRARY /opt /usr/freeware [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;GDAL_ROOT]/lib - PATH_SUFFIXES lib64 lib ) SET(GDAL_FOUND "NO") |