FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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."

Browse Source
This commit is contained in:
Robert Osfield 2010-11-05 11:21:55 +00:00
parent 95c7dc35d0
commit 2f51919979
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeModules/FindGDAL.cmake
View File

@ -57,20 +57,20 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h
) )
FIND_LIBRARY(GDAL_LIBRARY 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 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.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. 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.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 PATHS
~/Library/Frameworks ~/Library/Frameworks
/Library/Frameworks /Library/Frameworks