Changeset 1003

Timestamp:

03/17/10 15:35:28 (2 years ago)

Author:

robert

Message:

From J.P. Delport, "attached an updated FindGDAL that finds 1.6.0 version in Debian unstable. Could also be added to VPB.
"

Files:

• trunk/CMakeModules/FindGDAL.cmake (modified) (4 diffs)

trunk/CMakeModules/FindGDAL.cmake

@@ -21 +21 @@
 
 FIND_PATH(GDAL_INCLUDE_DIR gdal.h
+  PATHS
   $ENV{GDAL_DIR}
   NO_DEFAULT_PATH
@@ -58 +59 @@
 
 FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
+  NAMES gdal gdal_i gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
   PATHS
   c:/Program Files/FWTools2.1.0/lib
@@ -66 +67 @@
 )
 FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
+  NAMES gdal gdal_i gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
   PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
    c:/Program Files/FWTools2.1.0/lib
@@ -73 +74 @@
 )
 FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
+  NAMES gdal gdal_i gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
   PATHS
     ~/Library/Frameworks