diff options
| author | Brad King <brad.king@kitware.com> | 2012-08-14 12:31:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-14 12:31:45 (GMT) |
| commit | cd3bd23266a4a6c00595134a17a8bdaea9e28af5 (patch) | |
| tree | 515fcf4fdee211067497339acb52de321640c4fc /Modules/FindGDAL.cmake | |
| parent | 9acb4f118cd9a52aaa66897b1c0cd11dace3851c (diff) | |
| parent | 68bc863d5bd64f3e893722e403d4fd56bd2e175a (diff) | |
| download | CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.zip CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.gz CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.bz2 | |
Merge topic 'cleanup-style'
68bc863 Merge branch 'master' into cleanup-style
a05eba5 CMakeVersion.bash: Update sed expression for lower-case 'set'
3c0488d Fix WarnUnusedUnusedViaUnset test pass/fail regex
6c2c483 Remove trailing TAB from NSIS.template.in
9db3116 Remove CMake-language block-end command arguments
77543bd Convert CMake-language commands to lower case
7bbaa42 Remove trailing whitespace from most CMake and C/C++ code
be9db98 Merge topic 'watcom-compiler-version'
af42ae4 Watcom: Simplify compiler version detection (#11866)
Diffstat (limited to 'Modules/FindGDAL.cmake')
| -rw-r--r-- | Modules/FindGDAL.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/FindGDAL.cmake b/Modules/FindGDAL.cmake index c31bef5..1e09b82 100644 --- a/Modules/FindGDAL.cmake +++ b/Modules/FindGDAL.cmake @@ -28,19 +28,19 @@ # 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} @@ -57,12 +57,12 @@ 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} @@ -85,7 +85,7 @@ 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} |