diff options
Diffstat (limited to 'Modules/FindGDAL.cmake')
-rw-r--r-- | Modules/FindGDAL.cmake | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Modules/FindGDAL.cmake b/Modules/FindGDAL.cmake index c31bef5ca..6e898474b 100644 --- a/Modules/FindGDAL.cmake +++ b/Modules/FindGDAL.cmake @@ -28,22 +28,22 @@ # correspond to the ./configure --prefix=$GDAL_DIR # used in building gdal. # -# Created by Eric Wing. I'm not a gdal user, but OpenSceneGraph uses it +# Created by Eric Wing. I'm not a gdal user, but OpenSceneGraph uses it # for osgTerrain so I whipped this module together for completeness. # I actually don't know the conventions or where files are typically # placed in distros. # Any real gdal users are encouraged to correct this (but please don't -# break the OS X framework stuff when doing so which is what usually seems +# break the OS X framework stuff when doing so which is what usually seems # to happen). # This makes the presumption that you are include gdal.h like # #include "gdal.h" -FIND_PATH(GDAL_INCLUDE_DIR gdal.h +find_path(GDAL_INCLUDE_DIR gdal.h HINTS - $ENV{GDAL_DIR} - $ENV{GDAL_ROOT} + ENV GDAL_DIR + ENV GDAL_ROOT PATH_SUFFIXES include/gdal include/GDAL @@ -57,15 +57,15 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h /opt ) -IF(UNIX) +if(UNIX) # Use gdal-config to obtain the library version (this should hopefully # allow us to -lgdal1.x.y where x.y are correct version) # For some reason, libgdal development packages do not contain # libgdal.so... - FIND_PROGRAM(GDAL_CONFIG gdal-config + find_program(GDAL_CONFIG gdal-config HINTS - $ENV{GDAL_DIR} - $ENV{GDAL_ROOT} + ENV GDAL_DIR + ENV GDAL_ROOT PATH_SUFFIXES bin PATHS /sw # Fink @@ -85,13 +85,13 @@ IF(UNIX) endif() endif() -FIND_LIBRARY(GDAL_LIBRARY +find_library(GDAL_LIBRARY NAMES ${_gdal_lib} gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL HINTS - $ENV{GDAL_DIR} - $ENV{GDAL_ROOT} + ENV GDAL_DIR + ENV GDAL_ROOT ${_gdal_libpath} - PATH_SUFFIXES lib64 lib + PATH_SUFFIXES lib PATHS /sw /opt/local |