[SCM] osgearth branch, master, updated. 2b2e2458cbabb2851fcae33cfe908633915bd56c

[Pirmin Kalberer]

The following commit has been merged in the master branch:
commit 2b2e2458cbabb2851fcae33cfe908633915bd56c
Author: Pirmin Kalberer <pka at sourcepole.ch>
Date:   Mon May 9 21:32:30 2011 +0200

    GDAL 1.8 support

diff --git a/CMakeModules/FindGDAL.cmake b/CMakeModules/FindGDAL.cmake
index a6c9648..fdb9b25 100644
--- a/CMakeModules/FindGDAL.cmake
+++ b/CMakeModules/FindGDAL.cmake
@@ -57,7 +57,7 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h
 )
 
 FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
+  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
   PATHS
   c:/Program Files/FWTools2.1.0/lib
   $ENV{GDAL_DIR}
@@ -65,14 +65,14 @@ FIND_LIBRARY(GDAL_LIBRARY
   PATH_SUFFIXES lib64 lib
 )
 FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
+  NAMES gdal gdal_i gdal1.8.0 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.
    c:/Program Files/FWTools2.1.0/lib
     NO_DEFAULT_PATH
     PATH_SUFFIXES lib64 lib
 )
 FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
+  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
   PATHS
     ~/Library/Frameworks
     /Library/Frameworks
diff --git a/debian/changelog b/debian/changelog
index 1a19869..eff9d02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osgearth (2.0-3) unstable; urgency=low
+
+  * GDAL 1.8 support
+
+ -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Mon, 09 May 2011 21:32:01 +0200
+
 osgearth (2.0-2) unstable; urgency=low
 
   * Missing libraries added (*.so.2.0.0)
diff --git a/debian/patches/gdal1.8 b/debian/patches/gdal1.8
new file mode 100644
index 0000000..0085e31
--- /dev/null
+++ b/debian/patches/gdal1.8
@@ -0,0 +1,29 @@
+--- a/CMakeModules/FindGDAL.cmake
++++ b/CMakeModules/FindGDAL.cmake
+@@ -57,7 +57,7 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h
+ )
+ 
+ FIND_LIBRARY(GDAL_LIBRARY 
+-  NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
++  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
+   PATHS
+   c:/Program Files/FWTools2.1.0/lib
+   $ENV{GDAL_DIR}
+@@ -65,14 +65,14 @@ FIND_LIBRARY(GDAL_LIBRARY
+   PATH_SUFFIXES lib64 lib
+ )
+ FIND_LIBRARY(GDAL_LIBRARY 
+-  NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
++  NAMES gdal gdal_i gdal1.8.0 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.
+    c:/Program Files/FWTools2.1.0/lib
+     NO_DEFAULT_PATH
+     PATH_SUFFIXES lib64 lib
+ )
+ FIND_LIBRARY(GDAL_LIBRARY 
+-  NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
++  NAMES gdal gdal_i gdal1.8.0 gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL 
+   PATHS
+     ~/Library/Frameworks
+     /Library/Frameworks
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..6faa29c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gdal1.8

-- 
osgEarth terrain rendering toolkit