From 2ec9fa7ea94478462d9e8a8a3ec097d442f0959c Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 7 Aug 2007 10:33:25 +0000
Subject: [PATCH] Re-introduced GDAL plugin.

---
 CMakeLists.txt                | 1 +
 CMakeModules/FindGDAL.cmake   | 4 +++-
 src/osgPlugins/CMakeLists.txt | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 550f7b932..4a0021930 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,6 +149,7 @@ FIND_PACKAGE(Xine)
 FIND_PACKAGE(OpenVRML)
 FIND_PACKAGE(Performer)
 FIND_PACKAGE(ZLIB)
+FIND_PACKAGE(GDAL)
 
 # SET(DESIRED_QT_VERSION 3)
 # FIND_PACKAGE(Qt)
diff --git a/CMakeModules/FindGDAL.cmake b/CMakeModules/FindGDAL.cmake
index 3d60d2b72..5a7f67576 100644
--- a/CMakeModules/FindGDAL.cmake
+++ b/CMakeModules/FindGDAL.cmake
@@ -10,6 +10,7 @@
 # Created by Robert Osfield. 
 
 FIND_PATH(GDAL_INCLUDE_DIR gdal.h
+        ${GDAL_DIR}/include
     $ENV{GDAL_DIR}/include
     $ENV{GDAL_DIR}
     $ENV{OSGDIR}/include
@@ -28,8 +29,9 @@ FIND_PATH(GDAL_INCLUDE_DIR gdal.h
 )
 
 FIND_LIBRARY(GDAL_LIBRARY 
-    NAMES gdal
+    NAMES gdal gdal_i gdal1.4.0 gdal1.3.2
     PATHS
+    ${GDAL_DIR}/lib
     $ENV{GDAL_DIR}/lib
     $ENV{GDAL_DIR}
     $ENV{OSGDIR}/lib
diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt
index 941b288d5..90d4146e8 100644
--- a/src/osgPlugins/CMakeLists.txt
+++ b/src/osgPlugins/CMakeLists.txt
@@ -74,6 +74,9 @@ ENDIF(PNG_FOUND)
 IF(TIFF_FOUND)
 	ADD_SUBDIRECTORY(tiff)
 ENDIF(TIFF_FOUND)
+IF(GDAL_FOUND)
+	ADD_SUBDIRECTORY(gdal)
+ENDIF(GDAL_FOUND)
 
 ############################################################
 #