From 3537d21ae39b139dbcccf65c58f8704622b429ed Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 11 Mar 2008 13:19:08 +0000 Subject: [PATCH] From Jose Delport, added support for finding and using GDAL 1.5 --- CMakeModules/FindGDAL.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeModules/FindGDAL.cmake b/CMakeModules/FindGDAL.cmake index 845ab6e43..4ef6aaa13 100644 --- a/CMakeModules/FindGDAL.cmake +++ b/CMakeModules/FindGDAL.cmake @@ -56,20 +56,20 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h ) 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 $ENV{GDAL_DIR} NO_DEFAULT_PATH PATH_SUFFIXES lib64 lib ) 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. NO_DEFAULT_PATH PATH_SUFFIXES lib64 lib ) 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 ~/Library/Frameworks /Library/Frameworks