From 2f51919979161b78f6b05185411d4fcebfc9d68f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 5 Nov 2010 11:21:55 +0000 Subject: [PATCH] From Peter Bear, "Attached is a fix for the detection of GDAL 1.7.0. The previous CMake file only supported up to 1.6, this fix supports 1.7." --- CMakeModules/FindGDAL.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeModules/FindGDAL.cmake b/CMakeModules/FindGDAL.cmake index 44dc1b68e..5006e6c72 100644 --- a/CMakeModules/FindGDAL.cmake +++ b/CMakeModules/FindGDAL.cmake @@ -57,20 +57,20 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h ) FIND_LIBRARY(GDAL_LIBRARY - NAMES gdal gdal_i gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL + NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 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.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL + NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 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.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL + NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL PATHS ~/Library/Frameworks /Library/Frameworks