From 5fdeaeaaa2dbadcfa0e69d0f1413d04ba5e6d7d3 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 12 Mar 2007 11:48:35 +0000
Subject: [PATCH] Fixed osgTerrain CMakeLists.txt so it didn't include DataSet
 or GDAL references

---
 src/osgTerrain/CMakeLists.txt | 70 +++++++++++++++--------------------
 1 file changed, 29 insertions(+), 41 deletions(-)

diff --git a/src/osgTerrain/CMakeLists.txt b/src/osgTerrain/CMakeLists.txt
index bc8523fcc..6fecbea95 100644
--- a/src/osgTerrain/CMakeLists.txt
+++ b/src/osgTerrain/CMakeLists.txt
@@ -1,47 +1,35 @@
-# Only build if GDAL dependencies have been found.
-IF(GDAL_FOUND)
-	
-	IF   (DYNAMIC_OPENSCENEGRAPH)
-		ADD_DEFINITIONS(-DOSGTERRAIN_LIBRARY)
-	ELSE (DYNAMIC_OPENSCENEGRAPH)
-		ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
-	ENDIF(DYNAMIC_OPENSCENEGRAPH)
+IF   (DYNAMIC_OPENSCENEGRAPH)
+	ADD_DEFINITIONS(-DOSGTERRAIN_LIBRARY)
+ELSE (DYNAMIC_OPENSCENEGRAPH)
+	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
+ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
-	INCLUDE_DIRECTORIES(
-		${GDAL_INCLUDE_DIR}
-	)
-	
-	SET(LIB_NAME osgTerrain)
-	SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
-	SET(LIB_PUBLIC_HEADERS
-		${HEADER_PATH}/DataSet
-		${HEADER_PATH}/Export
-		${HEADER_PATH}/HeightFieldNode
-		${HEADER_PATH}/HeightFieldRenderer
-		${HEADER_PATH}/Version
-	)
+SET(LIB_NAME osgTerrain)
+SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
+SET(LIB_PUBLIC_HEADERS
+	${HEADER_PATH}/Export
+	${HEADER_PATH}/HeightFieldNode
+	${HEADER_PATH}/HeightFieldRenderer
+	${HEADER_PATH}/Version
+)
 
 # FIXME: For OS X, need flag for Framework or dylib
-	ADD_LIBRARY(${LIB_NAME}
-		${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-		${LIB_PUBLIC_HEADERS}
-		DataSet.cpp
-		HeightFieldNode.cpp
-		HeightFieldRenderer.cpp
-		Version.cpp
-	)
+ADD_LIBRARY(${LIB_NAME}
+	${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
+	${LIB_PUBLIC_HEADERS}
+	HeightFieldNode.cpp
+	HeightFieldRenderer.cpp
+	Version.cpp
+)
 
-	TARGET_LINK_LIBRARIES(${LIB_NAME}
-		osg
-		osgDB
-		osgUtil
-		osgFX
-		${GDAL_LIBRARY}
-		${OPENTHREADS_LIBRARY}
-		${OPENGL_LIBRARIES}
-	)
+TARGET_LINK_LIBRARIES(${LIB_NAME}
+	osg
+	osgDB
+	osgUtil
+	${OPENTHREADS_LIBRARY}
+	${OPENGL_LIBRARIES}
+)
+
+INCLUDE(ModuleInstall OPTIONAL)
 
-	INCLUDE(ModuleInstall OPTIONAL)
-	
-ENDIF(GDAL_FOUND)