From Jose Delport, added support for finding and using GDAL 1.5

This commit is contained in:
Robert Osfield 2008-03-11 13:19:08 +00:00
parent 3bdfb700aa
commit 3537d21ae3

View File

@ -56,20 +56,20 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h
) )
FIND_LIBRARY(GDAL_LIBRARY FIND_LIBRARY(GDAL_LIBRARY
NAMES gdal gdal_i gdal1.4.0 gdal1.3.2 GDAL NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
PATHS PATHS
$ENV{GDAL_DIR} $ENV{GDAL_DIR}
NO_DEFAULT_PATH NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib64 lib
) )
FIND_LIBRARY(GDAL_LIBRARY FIND_LIBRARY(GDAL_LIBRARY
NAMES gdal gdal_i gdal1.4.0 gdal1.3.2 GDAL NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
NO_DEFAULT_PATH NO_DEFAULT_PATH
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib64 lib
) )
FIND_LIBRARY(GDAL_LIBRARY FIND_LIBRARY(GDAL_LIBRARY
NAMES gdal gdal_i gdal1.4.0 gdal1.3.2 GDAL NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
PATHS PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks