From a1e436d9e78da2c2b1debf717507da758983e087 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 4 Jun 2007 20:32:15 +0000
Subject: [PATCH] From Jeremy Moles and Rbert Osfeild, added extra details
 about CMake build options.

---
 README.txt                    | 17 ++++++++++++++++-
 src/osgPlugins/dae/README.txt | 34 ++++++++++++++--------------------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/README.txt b/README.txt
index ff7fe8d90..1761afe44 100644
--- a/README.txt
+++ b/README.txt
@@ -43,13 +43,28 @@ configure script that'll run cmake for you:
   ./configure
   make
   sudo make install
-  
+
+Alternatively, you can create an out of source build directory and run configure
+from there. The advantage to this approach is that the temporary files
+created by CMake won't clutter the OpenSceneGraph source directory, also makes 
+it possilble to build multiple build targets. 
+
+  cd OpenSceneGraph
+  mkdir build
+  cd build
+  ../configure
+  make
+  sudo make install
+
 Under Windows use the GUI tool CMakeSetup to build your VisualStudio files. 
 The following page on our wiki dedicated to the CMake build should help
 guide you through the process:
 
    http://www.openscenegraph.com/index.php?page=Build.CMake
 
+Under OSX you can either use the CMake build system above, or use the Xcode 
+projects that you will find in OpenSceneGraph/Xcode.
+
 For further details on compiliation, installation and platform specific information
 read "Getting Started" at http://www.openscenegraph.org, under 
 "Documentation".
diff --git a/src/osgPlugins/dae/README.txt b/src/osgPlugins/dae/README.txt
index 71aa5f0e5..173e58ca9 100644
--- a/src/osgPlugins/dae/README.txt
+++ b/src/osgPlugins/dae/README.txt
@@ -6,8 +6,8 @@ See http://collada.org/ and http://khronos.org/collada/ for further info.
 
 RUNTIME USAGE EXAMPLES
 
-	osgviewer myFile.dae
-	osgconv myFile.osg myFile.dae
+    osgviewer myFile.dae
+    osgconv myFile.osg myFile.dae
 
 
 RUNTIME PLUGIN OPTIONS
@@ -26,28 +26,22 @@ polygon : export polygons as COLLADA polygons instead of polylists.
 BUILD DEPENDENCIES
 
 - COLLADA DOM (document object model) v1.4.1
-  see http://sourceforge.net/projects/collada-dom
-  svn export -r 34 https://svn.sourceforge.net/svnroot/collada-dom/trunk
+  http://collada.org/mediawiki/index.php/DOM_guide:_Setting_up
 
 - libxml2
 
 - iconv
 
-UNIX BUILD
+A standard "ccmake ." while in the root of the OSG source will expose
+two CMake variables: COLLADA_INCLUDE_DIR and COLLADA_LIBRARY. Using
+these two variables correctly can be a bit tricky (especially as
+the "right" and "wrong" ways to use Collada are hard to define), but
+I will briefly explain them below.
 
-set the env vars:
+  COLLADA_INCLUDE_DIR: This variable wants the path where it can
+  find the COLLADA headers. On most systems this will be something
+  like /usr/include or /usr/include/collada.
 
-  COLLADA_INSTALLED = yes
-  COLLADA_DAE_HOME = root directory of COLLADA DOM
-   
-  And if you've compiled the debug version of the COLLADA DOM then define:
-  
-  COLLADA_DEBUG_LIBS = yes
-  
-  Note, Collada svn trunk currently defaults to debug build.
-
-The above env vars can also be setup in your own custom Make/depdendencies file (copy this and point
-to the locally modified copy using the env var OSG_DEPENDCIES so the the OSG's build system can find
-it.
-
-//EOF
+  COLLADA_LIBRARY: This variable is asking for the FULL PATH to the
+  file libcollada_dom.a. As long as it can find this file, the
+  OSG Collada ReaderWriter should build just fine.