Permalink
Browse files

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."
  • Loading branch information...
osg-training-guest committed Nov 5, 2010
1 parent a2c2608 commit 9eb7803f7fa51e820a21b1f3a3d9930b875b38ea
Showing with 3 additions and 3 deletions.
  1. +3 −3 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

0 comments on commit 9eb7803

Please sign in to comment.