Changed the OpenThreads extern to a specific OpenTreads tag

AUTHORS.txt

@@ -1,223 +1,171 @@
-OpenSceneGraph Library 2.8.1
+OpenSceneGraph Library 2.2.0
 
-372 Contributors:
+281 Contributors:
 
 Firstname Surname
 -----------------
 Robert Osfield
 Don Burns
 Marco Jez
-Paul Martz
 Mike Weiblen
 Eric Wing
-Stephan Huber
-Mathias Fr<46>hlich
 Brede Johansen
 Geoff Michel
+Paul Martz
 Farshid Lashkari
+Stephan Huber
 Bob Kuehne
+Martin Lavery
 Ulrich Hertlein
 Eric Sokolowsky
-Jean-Sebastien Guay
-Martin Lavery
-David Callu
 Tree 
+Mike Wittman
 Luigi Calori
 Trajce Nikolov
-Mike Wittman
-Wojciech Lewandowski
-Paul Melis
-Colin McDonald
-Andy Skinner
-Roger James
 Pavel Moloshtan
-Mattias Helsing
 Tom Jolley
-Jeremy Moles
-Jason Beverage
+Mathias Fr<46>hlich
 Norman Vine
-Cedric Pinson
-Art Tevs
+David Callu
 Alberto Farre
-Roland Smeenk
-Michael Platings
+Roger James
 Andr<EFBFBD> Garneau
 Ruben Lopez
 Randall Hopper
-Jason Daly
-J.P. Delport
-Adrian Egli
 Olaf Flebbe
-Mathieu Marache
 Gideon May
 Don Tidrow
-Sherman Wilcox
 Romano Jos<6F> Magacho da Silva
-Per Fahlberg
 Michael Gronager
-Joakim Simonsson
-David Spilling
 Daniel Sj<53>lie
+Colin McDonald
 Chris Hanson
-Alberto Luaces
-Philip Lowman
-Chris Denham
-Melchior Franz
-Serge Lages
-Lionel Lagarde
+Jean-Sebastien Guay
+David Spilling
+Andy Skinner
+Per Fahlberg
 Joran Jessurun
 Frederic Marmond
 David Fries
-Bryan Thrall
 Boris Bralo
 Yefei He
-Tim Moore
-Terry Welsh
-Stephane Lamoliatte
 Sondra Iverson
 Rune Schmidt Jensen
-Rainer Oder
-Neil Groves
+Neil Salter
 Mike Connell
-Martin Aumueller
-Mario Valle
-Gordon Tomlinson
-Gino van den Bergen
-Carlo Camporesi
+Jeremy Moles
+Jason Daly
+Jason Beverage
 Ben Discoe
-Andreas Ekstrand
-Thibault Genessay
-Sukender 
 Sasa Bistrovic
+Rainer Oder
+Paul Melis
 Martin Naylor
+Martin Aumueller
 Markus Trenkwalder
 Loic Dachary
-Joseph Steel
-John Shue
+Joakim Simonsson
 Jan Peciva
 Jan Ciger
-Glenn Waldron
+Gordon Tomlinson
 Brad Colbert
+Art Tevs
+Andreas Ekstrand
 Vivek Rajan
+Stephane Simon
+Sherman Wilcox
 Sean Spicer
 Ravi Mathur
-Peter Hrenka
 Nikolaus Hanekamp
-Neil Salter
-Mihai Radu
+Michael Platings
 Michael Hartman
-Luc Frauciel
 Laurens Voerman
+Joseph Steel
+John Shue
 David Guthrie
 Corbin Holtz
 Brad Christiansen
-Blasius Czink
+Adrian Egli
 Toshiyuki Takahei
 Thom DeCarlo
-Tatsuhiro Nishioka
+Terry Welsh
 Simon Julier
 Sebastien Grignard
 Romano Magacho
-Richard Schmidt
-Riccardo Corsi
-Ralf Habacker
 Paul de Repentigny
-Liang Aibin
+Mihai Radu
+Luc Frauciel
 Leandro Motta Barros
-John Vidar Larring
-John Kelso
-Daniel Larimer
-Csaba Halasz
-Colin Dunlop
+Jos<EFBFBD> Delport
+Carlo Camporesi
+Bryan Thrall
 Bruce Clay
 Alberto Barbati
 Vladimir Shabanov
 Uwe Woessner
-Tony Horrobin
 Sohey Yamamoto
-Rudolf Wiedemann
-Rafa Gaitan
+Serge Lages
 Phil Atkin
-Miguel Escriva
 Mattias Linde
+Mathieu Marache
 Maria Ten
 Ken Sewell
 Julian Ortiz
+John Kelso
 Jeremy Bell
-Jaromir Vitek
 James French
-Gary Quinn
-Garrett Potts
 Gabor Dorka
-Fabio Mierlo
-Fabien Lavignotte
-Doug McCorkle
 Donn Mielcarek
-Donald Cipperly
 Domenico Mangieri
+Daniel Larimer
 Charles Cole
 Blake Williams
 Antoine Hue
-Andrew Bettison
-Andreas Goebel
 Anders Backman
 Ali Botorabi
 Zach Deedler
 Yuzhong Shen
-Wang Rui
 Tugkan Calapoglu
+Tony Horrobin
 Tim Daoust
+Thibault Genessay
 Terrex 
-Tanguy Fautr<74>
-Sylvain Marie
 Steve Lunsford
-Stephane Simon
 Stephan Eilemann
 Stanislav Blinov
-Sergey Leontyev
-Sebastian Messerschmidt
-Ralf Kern
-Pierre Haritchabalet
+Roland Smeenk
+Riccardo Corsi
+Rafa Giatan
+Philip Lowman
+Peter Hrenka
 Perry Miller
-Paul Obermeier
-Neil Hughes
 Nathan Monteleone
-Morn<EFBFBD> Pistorius
 Michael Henheffer
-Michael Guerrero
 Maya Leonard
-Max Bandazian
+Max Behensky
 Mathew May
-Martin Spott
 Martijn Kragtwijk
 Kevin Moiule
 Keith Steffen
-Katharina Plugge
 Joseph Winston
 John Aughey
 Johan Nouvel
-Jim Vaughan
-James Moliere
 Igor Kravtchenko
-He Sicong
-Gustavo Wagner
-Guillaume Chouvenc
 Gerrick Bivins
 George Tarantilis
-Frederic Bouvier
-Ferdi Smit
-Ewe Woessner
-Erik den Dekker
+Garret Potts
+Fabio Mierlo
 Edgar Ellis
-Don Leich
 David Ergo
 Daniel Trstenjak
-Christophe Loustaunau
-Brad Anderegg
+Csaba Halasz
 Andrew Sampson
 Andrew Lorino
+Andreas Goebel
+Alberto Luaces
 Zbigniew Sroczynski
 Yuri Vilmanis
+Wojciech Lewandowski
 Warren Macchi
 Wang Lam
 Walter J. Altice
@@ -225,148 +173,110 @@ Volker Walkiewicz
 Vladimir Vukicevic
 Vlad Danciu
 Vincent Vivanloc
-Vincent Bourdier
 Vasily Radostev
 Vaclav Bilek
 Tyge 
 Troy Yee
-Tomas Hnilica
 Tino Schwarze
-Thomas Weidner
+Tim Moore
 Thom Carlo
 Tery Welsh
-Steven Thomas
-Simon Hammett
-Sid Byce
-Shuxing Xiao
+Tanguy Fautr<74>
+Sylvan Marie
+Sylvain Marie
 Shane Arnott
 Sebastien Kuntz
-Ruth Lang
-Ruben Smelik
-Ross Anderson
+Rudolf Wiedemann
 Ronny Krueger
 Robert Swain
-Rob Bloemkool
 Rick Pingry
-Rick Appleton
-Ricard Schmidt
-Rene Molenaar
 Reinhard Sainitzer
 Rein Kadijk
-Raymond de Vries
-Ragnar Hammarqvist
+Ralf Kern
 Qing Shen
-Piotr Rak
 Philipp Siemoleit
-Philipp M<>chler
-Petr Salinger
-Paul Palumbo
 Paul Fredrikson
-Patrick Hartling
 Parag Chaudhur
-Panagiotis Papadakos
-Panagiotis Koutsourakis
 Orhun Birsoy
 Ole-Morten Duesund
 Nicolas Brodu
 Nathan Cournia
-Morten Haukness
+Morn<EFBFBD> Pistorius
 Mirko Viviani
 Mikkel Gjøl
-Mike Garrity
 Michael Polak
 Michael Morrison
 Michael Logan
 Max Rhiener
-Max Behensky
 Mauricio Hofmam
 Matthew May
 Matt Green
 Matt Burke
 Mathia Walker
 Mason Menninger
-Martins Innus
-Mario Guimaraes
+Martin Spott
+Martin Amueller
+Mario Valle
 Marin Lavery
-Marco Lehmann
-Marcin Prus
-Maciej Krol
-Lukas Diduch
 Louis Hamilton
-Lilin Xiong
 Lewis Harmon
-Lars Nilson
-Kyle Centers
 Kristopher Bixler
-Konstantin Sinitsyn
 Karsten Weiss
-Karl Heijdenberg
-Jutta Sauer
-Julian Scheid
 Josh Portway
 John Tan
 John Grant
 John Donovan
 John Davis
-John Argentieri
 Joan Abadie
-Jeroen den Dekker
-Jean-Christophe Lombardo
+Joakim Simmonsson
 Jay Zuckerman
 Jason Howlett
 Jason Ballenger
 J.E. Hoffmann
-Humar Carmona
 Henrique Bucher
-Hautio Jari
+Gustavo Wagner
 Guillaume Millet
 Graeme Harkness
-Glen Waldron
+Glenn Waldrom
 Gian Lorenzetto
 George Papagiannakis
+Gary Quinn
 Galen Faidley
+Frashid Lashkari
 Frank Warmerdam
-Frank Midgley
 Frank Lindeman
 Frank Lichtenheld
 Ferdinand Cornelissen
-Fajran Iman
 Fabien Dachicourt
-Emmanuel Roche
+Eric Sokolwsky
 Edmond Gheury
 Ed Ralston
 Duvan Cope
 Duncan Cavens
 Drew Whitehouse
 Douglas A. Pouk
+Doug McCorkle
+Donny Cipperly
 Dean Iverson
 David Jung
 David Gurhrie
-Danny Valente
-Daniel Stien
 Dan Minor
-Cyril Brulebois
 Clay Fowler
 Chuck Sembroski
 Chuck Seberion
-Christopher Blaesius
-Christian Kaser
 Chris McGlone
 Carlos Garcea
 Bruno Herbelin
 Brian Keener
 Brandon Hamm
+Brad Anderegg
 Bora Utka
-Bj<EFBFBD>rn Hein
-Bill Prendergast
-Benoit Laniel
+Blasius Czink
 Ben van Basten
 Bart Gallet
 Axel Volley
-Andy Preece
 Andrew Reyonolds
 Andreas Jochens
-Andre Normann
 Almalric Alexandre
 Allen Bierbaum
 Alexandre Amalric
@@ -374,5 +284,4 @@ Alberto Jaspe
 Alan Purvis
 Alan Ott
 Alan Harris
-Alan Dickinson
 Adam Richard

CMakeLists.txt

@@ -2,38 +2,22 @@ IF(WIN32)
     CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
 ELSE(WIN32)
     IF(APPLE)
-        CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
+        CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
+        IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
+            MESSAGE("Warning: A critical CMake bug exists in 2.4.6 and below. Trying to build Universal Binaries will result in a compile error that seems unrelated. Either avoid building Universal Binaries by changing the CMAKE_OSX_ARCHITECTURES field to list only your architecture, or upgrade to the current CVS version of CMake or a newer stable version if it exists.")
+        ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7)
     ELSE(APPLE)
         CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0 FATAL_ERROR)
     ENDIF(APPLE)
 ENDIF(WIN32)
 
-if(COMMAND cmake_policy)
-    # Works around warnings libraries linked against that don't
-    # have absolute paths (e.g. -lpthreads)
-    cmake_policy(SET CMP0003 NEW)
-
-    # Works around warnings about escaped quotes in ADD_DEFINITIONS
-    # statements.
-    cmake_policy(SET CMP0005 NEW)
-
-    # cmake-2.6.1 introduces policy cmp0008 decide how to treat full path libraries that do not appear to be valid library file names
-    # quote from cvslog "Such libraries worked by accident in the VS IDE and Xcode generators in CMake 2.4 and below."
-    if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4 AND ${CMAKE_PATCH_VERSION} GREATER 0)
-        cmake_policy(SET CMP0008 OLD)
-    endif(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4 AND ${CMAKE_PATCH_VERSION} GREATER 0)
-endif(COMMAND cmake_policy)
 
 PROJECT(OpenSceneGraph)
 
 SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
-SET(OPENSCENEGRAPH_MINOR_VERSION 8)
-SET(OPENSCENEGRAPH_PATCH_VERSION 1)
-SET(OPENSCENEGRAPH_SOVERSION 55)
-
-# set to 0 when not a release candidate, non zero means that any generated 
-# svn tags will be treated as release candidates of given number
-SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
+SET(OPENSCENEGRAPH_MINOR_VERSION 2)
+SET(OPENSCENEGRAPH_PATCH_VERSION 0)
+SET(OPENSCENEGRAPH_SOVERSION 25)
 
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
 
@@ -60,83 +44,34 @@ SET(OpenThreads_SOURCE_DIR ${OpenSceneGraph_SOURCE_DIR})
 # Maybe this can be used override existing behavior if needed?
 SET(CMAKE_MODULE_PATH "${OpenSceneGraph_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
 
+# Mainly for Windows as a convenience. This will find a directory in parallel with the
+# OSG source that contains 3rd party headers and libraries.
+# Use of relative paths in CMake is ill-advised, but don't know of any alternatives in this case
+#SET(CMAKE_INCLUDE_PATH "${OpenSceneGraph_SOURCE_DIR}/../3rdParty/include;${CMAKE_INCLUDE_PATH}")
+#SET(CMAKE_LIBRARY_PATH "${OpenSceneGraph_SOURCE_DIR}/../3rdParty/lib;${CMAKE_LIBRARY_PATH}")
+IF(USING_OSG_OP_OT_TRIPLE_SET)
+    SET(CMAKE_INCLUDE_PATH "${OpenSceneGraph_SOURCE_DIR}/../../3rdParty/include;${CMAKE_INCLUDE_PATH}")
+    SET(CMAKE_LIBRARY_PATH "${OpenSceneGraph_SOURCE_DIR}/../../3rdParty/lib;${CMAKE_LIBRARY_PATH}")
+ENDIF(USING_OSG_OP_OT_TRIPLE_SET)
+
 
 # Okay, here's the problem: On some platforms, linking against OpenThreads
-# is not enough and explicit linking to the underlying thread library
+# is not enough and explicit linking to the underlying thread library 
 # is also required (e.g. FreeBSD). But OpenThreads may be built with different
-# backends (Pthreads, Sproc, Windows) so we don't know what the underlying
-# thread library is because some platforms support multiple backends (e.g.
-# IRIX supports Sproc and Pthreads). Linking all libraries won't work
+# backends (Pthreads, Sproc, Windows) so we don't know what the underlying 
+# thread library is because some platforms support multiple backends (e.g. 
+# IRIX supports Sproc and Pthreads). Linking all libraries won't work 
 # because the libraries may be incompatible.
-# So the current solution is to attempt best guess linking and exempt certain
+# So the current solution is to attempt best guess linking and exempt certain 
 # cases. With IRIX, we're going to hope explicit linking to the underlying
 # library is not necessary. We currently don't case for pthreads on Windows
 # which might be an issue on things like Cygwin. This may need to be fixed.
 FIND_PACKAGE(Threads)
 IF(CMAKE_SYSTEM MATCHES IRIX)
     # Erase CMAKE_THREAD_LIBS_INIT and hope it works
-    SET(CMAKE_THREAD_LIBS_INIT "" CACHE INTERNAL "")
+    SET(CMAKE_THREAD_LIBS_INIT "" CACHE INTERNAL "")    
 ENDIF(CMAKE_SYSTEM MATCHES IRIX)
 
-OPTION(OSG_MAINTAINER "Enable OpenSceneGraph maintainer build methods, such as making svn branches, tags, updating ChangeLog." OFF)
-IF (OSG_MAINTAINER)
-
-    #SET(OPENSCENEGRAPH_SVN "trunk")
-    SET(OPENSCENEGRAPH_SVN "branches")
-
-    SET(OPENSCENEGRAPH_BRANCH OpenSceneGraph-${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION})
-
-    #
-    # Provide target for tagging a release
-    #
-    SET(SVNCOMMAND svn)
-    SET(SVNTRUNKDIR     http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk)
-    SET(SVNTAGDIR       http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags)
-    SET(SVNBRANCHDIR    http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches)
-
-    IF   (OPENSCENEGRAPH_SVN STREQUAL "trunk")
-        SET(SVNSOURCEDIR ${SVNTRUNKDIR})
-    ELSE (OPENSCENEGRAPH_SVN STREQUAL "trunk")
-        SET(SVNSOURCEDIR ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH})
-    ENDIF(OPENSCENEGRAPH_SVN STREQUAL "trunk")
-
-
-    IF   (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
-        SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION})
-    ELSE (OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
-        SET(RELEASE_NAME OpenSceneGraph-${OPENSCENEGRAPH_VERSION}-rc${OPENSCENEGRAPH_RELEASE_CANDIDATE})
-    ENDIF(OPENSCENEGRAPH_RELEASE_CANDIDATE EQUAL 0)
-
-
-    ADD_CUSTOM_TARGET(tag-test
-        COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
-    )
-
-    ADD_CUSTOM_TARGET(tag-run
-        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNTAGDIR}/${RELEASE_NAME} -m "Release ${RELEASE_NAME}"
-    )
-
-    ADD_CUSTOM_TARGET(branch-test
-        COMMAND echo ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
-    )
-
-    ADD_CUSTOM_TARGET(branch-run
-        COMMAND ${SVNCOMMAND} copy ${SVNSOURCEDIR} ${SVNBRANCHDIR}/${OPENSCENEGRAPH_BRANCH} -m "Branch ${OPENSCENEGRAPH_BRANCH}"
-    )
-
-    #
-    # Provide target for generating ChangeLog
-    #
-    SET(GENERATELOGS svn2cl)
-
-    ADD_CUSTOM_TARGET(ChangeLog
-        COMMAND ${SVNCOMMAND} update
-        COMMAND ${GENERATELOGS} ${SVNSOURCEDIR}
-    )
-    
-ENDIF(OSG_MAINTAINER)
-
-
 # Find OpenGL
 FIND_PACKAGE(OpenGL)
 
@@ -152,42 +87,41 @@ IF(UNIX)
     # Some Unicies need explicit linkage to the Math library or the build fails.
     FIND_LIBRARY(MATH_LIBRARY m)
 ENDIF(UNIX)
-
+    
 # Make the headers visible to everything
-IF(NOT ${PROJECT_BINARY_DIR} EQUAL ${PROJECT_SOURCE_DIR})
-   INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include)
-ENDIF(NOT ${PROJECT_BINARY_DIR} EQUAL ${PROJECT_SOURCE_DIR})
-
 INCLUDE_DIRECTORIES(
     ${OpenSceneGraph_SOURCE_DIR}/include
     ${OPENGL_INCLUDE_DIR}
 )
-
+    
 # Common global definitions
 #ADD_DEFINITIONS(-D)
 # Platform specific definitions
 
+IF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
+
+    SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT OFF)
+
+    IF   (CMAKE_SYSTEM MATCHES "AIX.*")
+        SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT ON)
+    ENDIF(CMAKE_SYSTEM MATCHES "AIX.*")
+
+    IF   (APPLE)
+        SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT ON)
+    ENDIF(APPLE)
+    
+ENDIF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
+
+OPTION(OSG_GLU_TESS_CALLBACK_TRIPLEDOT "Set to ON to build build with (...) version of GLU tesselator callback" ${DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT})
+
+IF   (OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
+    ADD_DEFINITIONS(-DGLU_TESS_CALLBACK_TRIPLEDOT)
+ENDIF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
+
 
 IF(WIN32)
-
-    IF(MSVC)
-        # This option is to enable the /MP switch for Visual Studio 2005 and above compilers
-        OPTION(WIN32_USE_MP "Set to ON to build OpenSceneGraph with the /MP option (Visual Studio 2005 and above)." OFF)
-        MARK_AS_ADVANCED(WIN32_USE_MP)
-        IF(WIN32_USE_MP)
-            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-        ENDIF(WIN32_USE_MP)
-
-        # turn off various warnings
-        # foreach(warning 4244 4251 4267 4275 4290 4786 4305 4996)
-        #     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd${warning}")
-        # endforeach(warning)
-
-        # More MSVC specific compilation flags
-        ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
-        ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
-    ENDIF(MSVC)
-
+    ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
+    ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
     #needed for net plugin
     SET (OSG_SOCKET_LIBS wsock32)
     # Both Cygwin and Msys need -DNOMINMAX ???
@@ -195,13 +129,13 @@ IF(WIN32)
         ADD_DEFINITIONS(-DNOMINMAX)
     ENDIF(UNIX)
 ########################################################################################################
-# the following options are MSVC specific,
-# the first OSG_MSVC_VERSIONED_DLL activate a custom build-time layout that should allow to run examples and application
+# the foolowing options are MSVC specific,
+# the first OSG_MSVC_VERSIONED_DLL activate a custom build-time layout that should allow to run examples and application 
 # fron bin folder without requiring installation step.
 # it also prepend "osg${OPENSCENEGRAPH_SOVERSION}-" to only .dll files, leaving .lib files untouched in lib
-# it also use a hack to get rid of Debug and Release folder in MSVC projects
+# it also use a hack to get rid of Debug and Release folder in MSVC projects 
 # all the .dll and .pdb are in bin and all the .lib and .exp are in lib
-#
+# 
 # the second option disable incremental linking in debug build , that is enabled by default by CMake
 ##########################################################################################################
 
@@ -243,43 +177,18 @@ ENDIF(WIN32)
 #luigi#ENDIF(UNIX)
 ########################################################################################################
 
-OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float Matrix instead of double." OFF)
+OPTION(OSG_USE_FLOAT_MATRIX "Set to ON to build OpenSceneGraph with float matrix instead of double." OFF)
 MARK_AS_ADVANCED(OSG_USE_FLOAT_MATRIX)
+IF(OSG_USE_FLOAT_MATRIX)        
+    ADD_DEFINITIONS(-DOSG_USE_FLOAT_MATRIX)
+ENDIF(OSG_USE_FLOAT_MATRIX)        
 
-OPTION(OSG_USE_FLOAT_PLANE "Set to ON to build OpenSceneGraph with float Plane instead of double." OFF)
+OPTION(OSG_USE_FLOAT_PLANE "Set to ON to build OpenSceneGraph with float matrix instead of double." OFF)
 MARK_AS_ADVANCED(OSG_USE_FLOAT_PLANE)
+IF(OSG_USE_FLOAT_PLANE)        
+    ADD_DEFINITIONS(-DOSG_USE_FLOAT_PLANE)
+ENDIF(OSG_USE_FLOAT_PLANE)        
 
-OPTION(OSG_USE_FLOAT_BOUNDINGSPHERE "Set to ON to build OpenSceneGraph with float BoundingSphere instead of double." ON)
-MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGSPHERE)
-
-OPTION(OSG_USE_FLOAT_BOUNDINGBOX "Set to ON to build OpenSceneGraph with float BoundingBox instead of double." ON)
-MARK_AS_ADVANCED(OSG_USE_FLOAT_BOUNDINGBOX)
-
-OPTION(OSG_USE_UTF8_FILENAME "Set to ON to use a UTF8 locale for filenames instead of the default locale." OFF)
-MARK_AS_ADVANCED(OSG_USE_UTF8_FILENAME)
-
-OPTION(OSG_DISABLE_MSVC_WARNINGS "Set to OFF to not disable MSVC warnings generated by OSG headers." ON)
-MARK_AS_ADVANCED(OSG_DISABLE_MSVC_WARNINGS)
-
-OPTION(OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION "Set to ON to use the ref_ptr<> T* operator() output conversion. " ON)
-
-################################################################################
-# Set Config file
-
-SET(OPENSCENEGRAPH_CONFIG_HEADER "${PROJECT_BINARY_DIR}/include/osg/Config")
-CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Config.in"
-               "${OPENSCENEGRAPH_CONFIG_HEADER}")
-# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
-
-
-################################################################################
-# Optional build components
-
-# OSG Applications
-OPTION(BUILD_OSG_APPLICATIONS "Enable to build OSG Applications (e.g. osgviewer)" ON)
-
-# OSG Examples
-OPTION(BUILD_OSG_EXAMPLES "Enable to build OSG Examples" OFF)
 
 ################################################################################
 # 3rd Party Dependency Stuff
@@ -289,126 +198,51 @@ ENDIF(WIN32)
 
 # Common to all platforms:
 FIND_PACKAGE(FreeType)
+FIND_PACKAGE(FLTK)
+FIND_PACKAGE(GLUT)
+FIND_PACKAGE(SDL)
+FIND_PACKAGE(FOX)
 FIND_PACKAGE(Inventor)
 FIND_PACKAGE(Jasper)
-FIND_PACKAGE(OpenEXR)
 FIND_PACKAGE(COLLADA)
-FIND_PACKAGE(ZLIB)
 FIND_PACKAGE(Xine)
 FIND_PACKAGE(OpenVRML)
 FIND_PACKAGE(Performer)
+FIND_PACKAGE(ZLIB)
 FIND_PACKAGE(GDAL)
-FIND_PACKAGE(CURL)
-FIND_PACKAGE(ITK)
-FIND_PACKAGE(LibVNCServer)
-FIND_PACKAGE(OurDCMTK)
-FIND_PACKAGE(XUL)
 
-#use pkg-config to find various modues
-INCLUDE(FindPkgConfig OPTIONAL)
+SET(wxWidgets_USE_LIBS base core gl net)
+FIND_PACKAGE(wxWidgets)
 
-IF(PKG_CONFIG_FOUND)
+# To select a specific version of QT define DESIRED_QT_VERSION
+# via cmake -DDESIRED_QT_VERSION=4
+IF  (DESIRED_QT_VERSION)
 
-    INCLUDE(FindPkgConfig)
+    IF  (DESIRED_QT_VERSION MATCHES 4)
+      FIND_PACKAGE(Qt4)
+    ELSE(DESIRED_QT_VERSION MATCHES 4)
+      FIND_PACKAGE(Qt3)
+    ENDIF(DESIRED_QT_VERSION MATCHES 4)
+    
+ELSE(DESIRED_QT_VERSION)
 
-    PKG_CHECK_MODULES(GTK gtk+-2.0)
-
-    IF(WIN32)
-        PKG_CHECK_MODULES(GTKGL gtkglext-win32-1.0)
-    ELSE(WIN32)
-        PKG_CHECK_MODULES(GTKGL gtkglext-x11-1.0)
-    ENDIF(WIN32)
-
-    PKG_CHECK_MODULES(RSVG librsvg-2.0)
-    PKG_CHECK_MODULES(CAIRO cairo)
-    PKG_CHECK_MODULES(POPPLER poppler-glib)
-
-ENDIF(PKG_CONFIG_FOUND)
-
-#optional example related dependencies
-IF   (BUILD_OSG_EXAMPLES)
+    FIND_PACKAGE(Qt4)
+    
+    IF  (NOT QT4_FOUND)
+        FIND_PACKAGE(Qt3)
+    ENDIF(NOT QT4_FOUND)
+    
+ENDIF(DESIRED_QT_VERSION)
 
 
-    FIND_PACKAGE(FLTK)
-    FIND_PACKAGE(GLUT)
-    FIND_PACKAGE(SDL)
-    FIND_PACKAGE(FOX)
-
-    SET(wxWidgets_USE_LIBS base core gl net)
-    FIND_PACKAGE(wxWidgets)
-
-    # To select a specific version of QT define DESIRED_QT_VERSION
-    # via cmake -DDESIRED_QT_VERSION=4
-    IF  (DESIRED_QT_VERSION)
-
-        IF  (DESIRED_QT_VERSION MATCHES 4)
-          FIND_PACKAGE(Qt4)
-        ELSE(DESIRED_QT_VERSION MATCHES 4)
-          FIND_PACKAGE(Qt3)
-        ENDIF(DESIRED_QT_VERSION MATCHES 4)
-
-    ELSE(DESIRED_QT_VERSION)
-
-        FIND_PACKAGE(Qt4)
-
-        IF  (NOT QT4_FOUND)
-            FIND_PACKAGE(Qt3)
-        ENDIF(NOT QT4_FOUND)
-
-    ENDIF(DESIRED_QT_VERSION)
-
-ENDIF(BUILD_OSG_EXAMPLES)
-
-
-
-
-
-
-#
-# Test to determine if we want the "tripledot" form of the GLU tesselator callback.
-#
-IF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
-    IF(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux")
-
-        # Skip the compile check for platforms that never need the variable
-        # form.
-        SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT false)
-
-    ELSE(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux")
-
-        # For other platforms perform the check
-        INCLUDE(CheckCXXSourceCompiles)
-        SET(CMAKE_REQUIRED_DEFINITIONS -DGLU_TESS_CALLBACK_TRIPLEDOT)
-        SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR} ${GL_INCLUDE_DIR})
-        SET(CMAKE_REQUIRED_LIBRARIES ${GLUT_LIBRARY} ${GL_LIBRARY})
-        CHECK_CXX_SOURCE_COMPILES(
-            "#include <osg/GL>
-            #include <osg/GLU>
-            static void testcb(GLvoid *, void*) { }
-            int main() {
-               GLUtesselator *t = gluNewTess();
-               gluTessCallback(t, GLU_TESS_VERTEX_DATA, (GLU_TESS_CALLBACK) testcb);
-               return 0;
-            }"
-            GLU_Tesselator_Needs_Variable_Parameter_Callback_Convention_Failure_Means_No)
-        SET(DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT
-            ${GLU_Tesselator_Needs_Variable_Parameter_Callback_Convention_Failure_Means_No})
-
-    ENDIF(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux")
-ENDIF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
-
-OPTION(OSG_GLU_TESS_CALLBACK_TRIPLEDOT "Set to ON to build with variable parameter (...) version of GLU tesselator callback" ${DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT})
-IF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
-    ADD_DEFINITIONS(-DGLU_TESS_CALLBACK_TRIPLEDOT)
-ENDIF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
 
 # Platform specific:
 # (We can approach this one of two ways. We can try to FIND everything
 # and simply check if we found the packages before actually building
-# or we can hardcode the cases. The advantage of the former is that
+# or we can hardcode the cases. The advantage of the former is that 
 # packages that are installed on platforms that don't require them
-# will still get built (presuming no compatibility issues). But this
-# also means modules that are redundant may get built. For example,
+# will still get built (presuming no compatibility issues). But this 
+# also means modules that are redundant may get built. For example, 
 # OS X doesn't need GIF, JPEG, PNG, TIFF, etc because it uses QuickTime.
 # Also, it will clutter the CMake menu with "NOT_FOUND".
 # The downside to the latter is that it is harder to build those
@@ -426,8 +260,8 @@ IF(NOT APPLE)
     IF(WIN32)
         FIND_PACKAGE(QuickTime)
     ENDIF(WIN32)
-
-ELSE(NOT APPLE)
+    
+ELSE(NOT APPLE) 
     FIND_PACKAGE(QuickTime)
 ENDIF(NOT APPLE)
 
@@ -442,20 +276,7 @@ ENDIF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
 ################################################################################
 # Installation stuff
 
-SET(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually d on windows")
-ADD_DEFINITIONS(-DOSG_DEBUG_POSTFIX=${CMAKE_DEBUG_POSTFIX})
-
-IF(UNIX AND NOT WIN32)
-  IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    ADD_DEFINITIONS("-D_DEBUG")
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-ENDIF(UNIX AND NOT WIN32)
-
-IF(CYGWIN)
-  IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    ADD_DEFINITIONS("-D_DEBUG")
-  ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-ENDIF(CYGWIN)
+SET(CMAKE_DEBUG_POSTFIX  "d")
 
 IF(UNIX AND NOT WIN32 AND NOT APPLE)
   IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
@@ -466,43 +287,21 @@ ENDIF(UNIX AND NOT WIN32 AND NOT APPLE)
 IF(NOT DEFINED LIB_POSTFIX)
     SET(LIB_POSTFIX "")
 ENDIF(NOT DEFINED LIB_POSTFIX)
-
-# Here we apparantly do some funky stuff with making the bin/ and lib/
-# folders which is probably needed to work around a very old CMake bug?
-
+    
 #SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin/${CMAKE_SYSTEM_NAME})
 SET(OUTPUT_BINDIR ${PROJECT_BINARY_DIR}/bin)
 MAKE_DIRECTORY(${OUTPUT_BINDIR})
-IF(MSVC AND NOT MSVC_IDE)
-    MAKE_DIRECTORY(${OUTPUT_BINDIR}/${OSG_PLUGINS})
-ENDIF(MSVC AND NOT MSVC_IDE)
+SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR})
 
 #SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib/${CMAKE_SYSTEM_NAME})
 SET(OUTPUT_LIBDIR ${PROJECT_BINARY_DIR}/lib)
 MAKE_DIRECTORY(${OUTPUT_LIBDIR})
 IF(NOT MSVC)
-    MAKE_DIRECTORY(${OUTPUT_LIBDIR}/${OSG_PLUGINS})
+	MAKE_DIRECTORY(${OUTPUT_LIBDIR}/${OSG_PLUGINS})	
 ENDIF(NOT MSVC)
+SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
 
-# On CMake 2.4.x use EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH and later
-# we work around the DLL placement by use of the PREFIX target property hack
-#
-# On CMake 2.6.x use the newly minted CMAKE_LIBRARY_OUTPUT_DIRECTORY,
-# CMAKE_ARCHIVE_OUTPUT_DIRECTORY & CMAKE_RUNTIME_OUTPUT_DIRECTORY
 
-IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
-    # If CMake >= 2.6.0
-    SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
-    SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_BINDIR})
-    IF(WIN32)
-        SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_BINDIR})
-    ELSE(WIN32)
-        SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR})
-    ENDIF(WIN32)
-ELSE(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
-    SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_BINDIR})
-    SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
-ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 4)
 
 #SET(INSTALL_BINDIR OpenSceneGraph/bin)
 #SET(INSTALL_INCDIR OpenSceneGraph/include)
@@ -533,68 +332,6 @@ SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} CACHE STRING "You may add additiona
 # This is unofficial so this may be removed or changed at anytime.
 SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} CACHE STRING "(EXPERIMENTAL) You may add additional search paths here. Use ; to separate multiple paths.")
 
-# This is for an advanced option to give aggressive warnings
-# under different compilers. If yours is not implemented, this option
-# will not be made available.
-IF(CMAKE_COMPILER_IS_GNUCXX)
-    # To be complete, we might also do GNUCC flags,
-    # but everything here is C++ code.
-    # -Wshadow and -Woverloaded-virtual are also interesting flags, but OSG
-    # returns too many hits.
-    # FYI, if we do implement GNUCC, then -Wmissing-prototypes in another
-    # interesting C-specific flag.
-    # Also, there is a bug in gcc 4.0. Under C++, -pedantic will create
-    # errors instead of warnings for certain issues, including superfluous
-    # semicolons and commas, and the use of long long. -fpermissive seems
-    # to be the workaround.
-    SET(OSG_AGGRESSIVE_WARNING_FLAGS -Wall -Wparentheses -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -fpermissive)
-
-    # Previous included -Wformat=2 in OSG_AGGRESSIVE_WARNING_FLAGS but had to remove it due to standard library errors
-
-
-ELSE(CMAKE_COMPILER_IS_GNUCXX)
-    IF(MSVC)
-        # FIXME: What are good aggressive warning flags for Visual Studio?
-        # And do we need to further subcase this for different versions of VS?
-        # CMake variables: MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005
-        SET(OSG_AGGRESSIVE_WARNING_FLAGS /W4 /wd4706 /wd4127 /wd4100)
-
-
-    ELSE(MSVC)
-        # CMake lacks an elseif, so other non-gcc, non-VS compilers need
-        # to be listed below. If unhandled, OSG_AGGRESSIVE_WARNING_FLAGS should
-        # remain unset.
-    ENDIF(MSVC)
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-
-# This part is for the CMake menu option to toggle the warnings on/off.
-# This will only be made available if we set values for OSG_AGGRESSIVE_WARNING_FLAGS.
-IF(OSG_AGGRESSIVE_WARNING_FLAGS)
-
-    IF (APPLE)
-        SET(DEFAULT_USE_AGGRESSIVE_WARNINGS OFF)
-    ELSE(APPLE)
-        SET(DEFAULT_USE_AGGRESSIVE_WARNINGS ON)
-    ENDIF(APPLE)
-
-    OPTION(OSG_USE_AGGRESSIVE_WARNINGS "Enable to activate aggressive warnings" ${DEFAULT_USE_AGGRESSIVE_WARNINGS})
-    MARK_AS_ADVANCED(OSG_USE_AGGRESSIVE_WARNINGS)
-
-    IF(OSG_USE_AGGRESSIVE_WARNINGS)
-        # Add flags defined by OSG_AGGRESSIVE_WARNING_FLAGS if they aren't already there
-        FOREACH(flag ${OSG_AGGRESSIVE_WARNING_FLAGS})
-            IF(NOT CMAKE_CXX_FLAGS MATCHES "${flag}")
-                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-            ENDIF(NOT CMAKE_CXX_FLAGS MATCHES "${flag}")
-        ENDFOREACH(flag)
-    ELSE(OSG_USE_AGGRESSIVE_WARNINGS)
-        # Remove all flags considered aggresive
-        FOREACH(flag ${OSG_AGGRESSIVE_WARNING_FLAGS})
-            STRING(REGEX REPLACE "${flag}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-        ENDFOREACH(flag)
-    ENDIF(OSG_USE_AGGRESSIVE_WARNINGS)
-ENDIF(OSG_AGGRESSIVE_WARNING_FLAGS)
-
 
 # Dynamic vs Static Linking
 OPTION(DYNAMIC_OPENSCENEGRAPH "Set to ON to build OpenSceneGraph for dynamic linking.  Use OFF for static." ON)
@@ -608,37 +345,89 @@ INCLUDE(OsgMacroUtils)
 # OSG Core
 ADD_SUBDIRECTORY(src)
 
+# OSG Applications
+OPTION(BUILD_OSG_APPLICATIONS "Enable to build OSG Applications (e.g. osgviewer)" ON)
 IF   (BUILD_OSG_APPLICATIONS)
     ADD_SUBDIRECTORY(applications)
 ENDIF(BUILD_OSG_APPLICATIONS)
 
+# OSG Examples
+OPTION(BUILD_OSG_EXAMPLES "Enable to build OSG Examples" OFF)
 IF   (BUILD_OSG_EXAMPLES)
     ADD_SUBDIRECTORY(examples)
 ENDIF(BUILD_OSG_EXAMPLES)
 
+# This is for an advanced option to give aggressive warnings 
+# under different compilers. If yours is not implemented, this option
+# will not be made available.
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # To be complete, we might also do GNUCC flags, 
+    # but everything here is C++ code.
+    # -Wshadow and -Woverloaded-virtual are also interesting flags, but OSG
+    # returns too many hits.
+    # FYI, if we do implement GNUCC, then -Wmissing-prototypes in another 
+    # interesting C-specific flag.
+    # Also, there is a bug in gcc 4.0. Under C++, -pedantic will create
+    # errors instead of warnings for certain issues, including superfluous
+    # semicolons and commas, and the use of long long. -fpermissive seems
+    # to be the workaround. 
+    SET(OSG_AGGRESSIVE_WARNING_FLAGS "-Wall -Wparentheses -Wformat=2 -Wno-long-long -Wno-import -pedantic -Wreturn-type -Wmissing-braces -Wunknown-pragmas -Wunused -fpermissive")
+ELSE(CMAKE_COMPILER_IS_GNUCXX)
+    IF(MSVC)
+        # FIXME: What are good aggressive warning flags for Visual Studio?
+        # And do we need to further subcase this for different versions of VS?
+        # CMake variables: MSVC60, MSVC70, MSVC71, MSVC80, CMAKE_COMPILER_2005
+        SET(OSG_AGGRESSIVE_WARNING_FLAGS "/Wall /W4")
+        
 
-# Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4
+    ELSE(MSVC)
+        # CMake lacks an elseif, so other non-gcc, non-VS compilers need
+        # to be listed below. If unhandled, OSG_AGGRESSIVE_WARNING_FLAGS should 
+        # remain unset.
+    ENDIF(MSVC)
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+# This part is for the CMake menu option to toggle the warnings on/off.
+# This will only be made available if we set values for OSG_AGGRESSIVE_WARNING_FLAGS.
+IF(OSG_AGGRESSIVE_WARNING_FLAGS)
+    OPTION(OSG_USE_AGGRESSIVE_WARNINGS "Enable to activate aggressive warnings" OFF)
+    MARK_AS_ADVANCED(OSG_USE_AGGRESSIVE_WARNINGS)
+
+    IF(OSG_USE_AGGRESSIVE_WARNINGS)
+        IF(NOT "${OLD_CMAKE_CXX_FLAGS_WAS_SET}")
+            SET(OLD_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" CACHE INTERNAL "Old CXX flags")
+            SET(OLD_CMAKE_CXX_FLAGS_WAS_SET 1 CACHE INTERNAL "Old CXX flags was set")
+            SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OSG_AGGRESSIVE_WARNING_FLAGS}" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+        ENDIF(NOT "${OLD_CMAKE_CXX_FLAGS_WAS_SET}")
+    ELSE(OSG_USE_AGGRESSIVE_WARNINGS)
+        # FIXME: This will lose any changes made after OLD_CMAKE_CXX_FLAGS was 
+        # set. The better way would be to parse the string and remove each
+        # option explicitly.
+        IF("${OLD_CMAKE_CXX_FLAGS_WAS_SET}")
+            SET(CMAKE_CXX_FLAGS "${OLD_CMAKE_CXX_FLAGS}" CACHE STRING "Flags used by the compiler during all build types." FORCE)
+            SET(OLD_CMAKE_CXX_FLAGS_WAS_SET 0 CACHE INTERNAL "Old CXX flags was set")
+        ENDIF("${OLD_CMAKE_CXX_FLAGS_WAS_SET}")
+    ENDIF(OSG_USE_AGGRESSIVE_WARNINGS)
+ENDIF(OSG_AGGRESSIVE_WARNING_FLAGS)
+
+# Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4 
 # and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support.
 IF(APPLE)
     # These are just defaults/recommendations, but how we want to build
     # out of the box. But the user needs to be able to change these options.
-    # So we must only set the values the first time CMake is run, or we
+    # So we must only set the values the first time CMake is run, or we 
     # will overwrite any changes the user sets.
     # FORCE is used because the options are not reflected in the UI otherwise.
     # Seems like a good place to add version specific compiler flags too.
     IF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
-        # This is really fragile, but CMake doesn't provide the OS system
-        # version information we need. (Darwin versions can be changed
+        # This is really fragile, but CMake doesn't provide the OS system 
+        # version information we need. (Darwin versions can be changed 
         # independently of OS X versions.)
         # It does look like CMake handles the CMAKE_OSX_SYSROOT automatically.
-        IF(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
-            # 64-bit compiles are not supported with Carbon. We should enable 
-            # 64-bit compilation by default once osgviewer has been 
-            # rewritten with Cocoa.
-            #SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE)
-            SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE)
+        IF(EXISTS /Developer/SDKs/10.5.sdk)
+            SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE)
             SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
-        ELSE(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
+        ELSE(EXISTS /Developer/SDKs/10.5.sdk)
             IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
                 SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE)
                 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE)
@@ -647,193 +436,50 @@ IF(APPLE)
                 # Should break down further to set the -mmacosx-version-min,
                 # but the SDK detection is too unreliable here.
             ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk)
-        ENDIF(EXISTS /Developer/SDKs/MacOSX10.5.sdk)
+        ENDIF(EXISTS /Developer/SDKs/10.5.sdk)
     ENDIF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
-
+    
     OPTION(OSG_BUILD_APPLICATION_BUNDLES "Enable the building of applications and examples as OSX Bundles" OFF)
-
+    
 ENDIF(APPLE)
 
 
-#
-# Provide target for generating wrappers
-#
-SET(GENWRAPPER genwrapper)
-
-ADD_CUSTOM_TARGET(wrappers
-    COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/genwrapper.conf -t ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/Doxyfile.template -d ${OpenSceneGraph_SOURCE_DIR} | doxygen -
-    COMMAND ${GENWRAPPER} -c ${OpenSceneGraph_SOURCE_DIR}/src/osgWrappers/genwrapper.conf -l ${OpenSceneGraph_SOURCE_DIR}
-)
-
 # For Doxygen
+#FIXME: I haven't figured out what to do with OSG's multiple doxyfiles 
+# and footer.
 INCLUDE(${CMAKE_ROOT}/Modules/Documentation.cmake OPTIONAL)
-OPTION(BUILD_DOCUMENTATION "Build OpenSceneGraph reference documentation using doxygen (use: make DoxygenDoc)" OFF)
-MARK_AS_ADVANCED(CLEAR BUILD_DOCUMENTATION)
+
 # To build the documention, you will have to enable it
 # and then do the equivalent of "make DoxygenDoc".
 IF(BUILD_DOCUMENTATION)
-
-    OPTION(BUILD_REF_DOCS_SEARCHENGINE "Enable doxygen's search engine (requires that documentation to be installed on a php enabled web server)" OFF)
-    IF(BUILD_REF_DOCS_SEARCHENGINE)
-        SET(SEARCHENGINE YES)
-    ELSE(BUILD_REF_DOCS_SEARCHENGINE)
-        SET(SEARCHENGINE NO)
-    ENDIF(BUILD_REF_DOCS_SEARCHENGINE)
-
-    OPTION(BUILD_REF_DOCS_TAGFILE "Generate a tag file named osg.tag on the documentation web server" OFF)
-    IF(BUILD_REF_DOCS_TAGFILE)
-        SET(GENERATE_TAGFILE "${OpenSceneGraph_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg.tag")
-    ELSE(BUILD_REF_DOCS_TAGFILE)
-        SET(GENERATE_TAGFILE "")
-    ENDIF(BUILD_REF_DOCS_TAGFILE)
-
     IF(DOT)
         SET(HAVE_DOT YES)
     ELSE(DOT)
         SET(HAVE_DOT NO)
     ENDIF(DOT)
-    
-    # If html help generation was requested. DOCUMENTATION_HTML_HELP is defined by Documentation.cmake
-    SET(GENERATE_HTMLHELP "NO")
-    IF(DOCUMENTATION_HTML_HELP)
-        # on windows Documentation.cmake finds the html help workshop fi it exists. On u*ix we might have it with wine but no way to point it out
-        IF(NOT WIN32)
-            SET(HTML_HELP_COMPILER "" CACHE FILEPATH "Enter location of the HTML help compiler to let doxygen compile html")
-            MARK_AS_ADVANCED(HTML_HELP_COMPILER)
-        ENDIF(NOT WIN32)
-        # this var sets a proper value in .doxygen files when coniguring them below
-        SET(GENERATE_HTMLHELP "YES")
-    endif(DOCUMENTATION_HTML_HELP)
-  
-    # This processes our doxyfile.cmake and substitutes paths to generate
+    # This processes our Doxyfile.in and substitutes paths to generate
     # a final Doxyfile
     CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/doxyfile.cmake
-        ${PROJECT_BINARY_DIR}/doc/openscenegraph.doxyfile
+        ${PROJECT_BINARY_DIR}/doc/doxyfile
     )
-    # copy the osg logo to documentations target folder
-    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/icons/src/osg32-32.png
-        ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs/osg32-32.png COPYONLY
-    )
-    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenSceneGraphReferenceDocs DESTINATION doc COMPONENT openscenegraph-doc)
-
-    # now set up openthreads documentation generation
-    IF(BUILD_REF_DOCS_TAGFILE)
-        SET(GENERATE_TAGFILE "${OpenSceneGraph_BINARY_DIR}/doc/OpenThreadsReferenceDocs/ot.tag")
-    ENDIF(BUILD_REF_DOCS_TAGFILE)
-
-    # This processes our openthreads.doxyfile.cmake and generate a final doxyfile
-    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/openthreads.doxyfile.cmake
-        ${PROJECT_BINARY_DIR}/doc/openthreads.doxyfile
-    )
-    # copy the osg logo to documentations target folder
-    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/icons/src/osg32-32.png
-        ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs/osg32-32.png COPYONLY
-    )
-    #INSTALL(FILES ${PROJECT_BINARY_DIR}/doc/${PROJECT_NAME}ReferenceDocs-${OPENSCENEGRAPH_VERSION}.chm DESTINATION doc OPTIONAL COMPONENT openscenegraph-doc)
-    INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/OpenThreadsReferenceDocs DESTINATION doc COMPONENT openthreads-doc)
-
-    # Process our other doxyfiles but don't create targets for these
-    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/all_Doxyfile
-        ${PROJECT_BINARY_DIR}/doc/all_Doxyfile)
-    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/auto_Doxyfile
-        ${PROJECT_BINARY_DIR}/doc/auto_Doxyfile)
-    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/Doxyfiles/core_Doxyfile
-        ${PROJECT_BINARY_DIR}/doc/core_Doxyfile)
-    
     # This creates a new target to build documentation.
     # It runs ${DOXYGEN} which is the full path and executable to
     # Doxygen on your system, set by the FindDoxygen.cmake module
     # (called by FindDocumentation.cmake).
     # It runs the final generated Doxyfile against it.
     # The DOT_PATH is substituted into the Doxyfile.
-    ADD_CUSTOM_TARGET(doc_openscenegraph ${DOXYGEN}
-        ${PROJECT_BINARY_DIR}/doc/openscenegraph.doxyfile
-    )
-    ADD_CUSTOM_TARGET(doc_openthreads ${DOXYGEN}
-        ${PROJECT_BINARY_DIR}/doc/openthreads.doxyfile
+    ADD_CUSTOM_TARGET(DoxygenDoc ${DOXYGEN}
+        ${PROJECT_BINARY_DIR}/docs/doxyfile
     )
 ENDIF(BUILD_DOCUMENTATION)
 
-OPTION(BUILD_DASHBOARD_REPORTS "Set to ON to activate reporting of OpenSceneGraph builds here http://www.cdash.org/CDashPublic/index.php?project=OpenSceneGraph" OFF)
-IF(BUILD_DASHBOARD_REPORTS)
-# The following are required to uses Dart and the Cdash dashboard
-# viewable here : http://www.cdash.org/CDashPublic/index.php?project=OpenSceneGraph
-    INCLUDE(Dart)
-ENDIF(BUILD_DASHBOARD_REPORTS)
-
-# present the packaging option only if we have the cpack command defined (effectively >= 2.6.0)
-IF(CMAKE_CPACK_COMMAND)
-    OPTION(BUILD_OSG_PACKAGES "Set to ON to generate CPack configuration files and packaging targets" OFF)
-    IF(BUILD_OSG_PACKAGES)
-      INCLUDE(OsgCPack)
-    ENDIF(BUILD_OSG_PACKAGES)
-ENDIF(CMAKE_CPACK_COMMAND)
-
-# Generate pkg-config configuration file
-
-CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/pkgconfig/openscenegraph.pc.in
-        ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc
-    @ONLY
-    )
-
-INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openscenegraph.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev)
-
-# Run this as late as possible so users can easier spot the message
-IF (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
-SET(REQUIRES_LIBPATH_MESSAGE ON)
-ENDIF(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local") 
-
-IF(REQUIRES_LIBPATH_MESSAGE)
-
-    IF (NOT OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE)
- 
-        SET(OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether the libpath message has been reported before")
-
-        MESSAGE("\nThe build system is configured to instal libraries to ${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}\n"
-            "Your applications may not be able to find your installed libraries unless you:\n"
-            "    set your LD_LIBRARY_PATH (user specific) or\n"
-            "    update your ld.so configuration (system wide)")
-        IF(IS_DIRECTORY /etc/ld.so.conf.d)
-            MESSAGE("You have an ld.so.conf.d directory on your system, so if you wish to ensure that\n"
-                "applications find the installed osg libraries, system wide, you could install a\n"
-                "openscenegraph specific ld.so configuration with:\n"
-                "    sudo make install_ld_conf\n")
-            CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/packaging/ld.so.conf.d/openscenegraph.conf.in
-                ${PROJECT_BINARY_DIR}/packaging/ld.so.conf.d/openscenegraph.conf
-            )
-            ADD_CUSTOM_TARGET(install_ld_conf ${CMAKE_COMMAND} -E copy_if_different 
-                ${PROJECT_BINARY_DIR}/packaging/ld.so.conf.d/openscenegraph.conf
-                /etc/ld.so.conf.d/openscenegraph.conf
-                COMMAND ldconfig
-                COMMENT "Copying openscenegraph.conf to /etc/ld.so.conf.d and running ldconfig"
-            )
-        ELSE(IS_DIRECTORY /etc/ld.so.conf.d)
-            IF(EXISTS /etc/ld.so.conf)
-                MESSAGE("You have an ld.so.conf file in /etc, if you wish to ensure \n"
-                "that applications find the installed osg libraries, system wide, you\n"
-                "could add ${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX} to it.")
-            ENDIF(EXISTS /etc/ld.so.conf)
-        ENDIF(IS_DIRECTORY /etc/ld.so.conf.d)
-
-        # emit a message during installation.
-        INSTALL(CODE "MESSAGE(\"Libraries were installed to ${CMAKE_INSTALL_PREFIX}lib${LIB_POSTFIX}.\\nYou may need to update your ld.so configuration. \")")
-
-    ENDIF(NOT OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE)
-
-ELSE(REQUIRES_LIBPATH_MESSAGE)
-
-    SET(OSG_LIBPATH_MESSAGE_HAS_BEEN_RUN_BEFORE 0 CACHE INTERNAL "Flag to track whether the libpath message has been reported before")
-
-ENDIF(REQUIRES_LIBPATH_MESSAGE)
-
-
 # This needs to be run very last so other parts of the scripts can take
 # advantage of this.
 IF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
     SET(OSG_CONFIG_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether this is the first time running CMake or if CMake has been configured before")
 ENDIF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE)
 
+
 #-----------------------------------------------------------------------------
 ### uninstall target
 #-----------------------------------------------------------------------------
@@ -843,3 +489,4 @@ CONFIGURE_FILE(
   IMMEDIATE @ONLY)
 ADD_CUSTOM_TARGET(uninstall
   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+

CMakeModules/CheckAtomicOps.cmake

@@ -1,118 +0,0 @@
-# Check for availability of atomic operations 
-# This module defines
-# OPENTHREADS_HAVE_ATOMIC_OPS
-
-INCLUDE(CheckCXXSourceRuns)
-
-# Do step by step checking, 
-CHECK_CXX_SOURCE_RUNS("
-#include <cstdlib>
-
-int main()
-{
-   unsigned value = 0;
-   void* ptr = &value;
-   __sync_add_and_fetch(&value, 1);
-   __sync_synchronize();
-   __sync_sub_and_fetch(&value, 1);
-   if (!__sync_bool_compare_and_swap(&value, 0, 1))
-      return EXIT_FAILURE;
-   
-   if (!__sync_bool_compare_and_swap(&ptr, ptr, ptr))
-      return EXIT_FAILURE;
-
-   return EXIT_SUCCESS;
-}
-" _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS)
-
-CHECK_CXX_SOURCE_RUNS("
-#include <stdlib.h>
-
-int main(int, const char**)
-{
-   unsigned value = 0;
-   void* ptr = &value;
-   __add_and_fetch(&value, 1);
-   __synchronize(value);
-   __sub_and_fetch(&value, 1);
-   if (!__compare_and_swap(&value, 0, 1))
-      return EXIT_FAILURE;
-   
-   if (!__compare_and_swap((unsigned long*)&ptr, (unsigned long)ptr, (unsigned long)ptr))
-      return EXIT_FAILURE;
-
-   return EXIT_SUCCESS;
-}
-" _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS)
-
-CHECK_CXX_SOURCE_RUNS("
-#include <atomic.h>
-#include <cstdlib>
-
-int main(int, const char**)
-{
-   uint_t value = 0;
-   void* ptr = &value;
-   atomic_inc_uint_nv(&value);
-   membar_consumer();
-   atomic_dec_uint_nv(&value);
-   if (0 != atomic_cas_uint(&value, 0, 1))
-      return EXIT_FAILURE;
-   
-   if (ptr != atomic_cas_ptr(&ptr, ptr, ptr))
-      return EXIT_FAILURE;
-
-   return EXIT_SUCCESS;
-}
-" _OPENTHREADS_ATOMIC_USE_SUN)
-
-CHECK_CXX_SOURCE_RUNS("
-#include <windows.h>
-#include <intrin.h>
-#include <cstdlib>
-
-#pragma intrinsic(_InterlockedAnd)
-#pragma intrinsic(_InterlockedOr)
-#pragma intrinsic(_InterlockedXor)
-
-int main(int, const char**)
-{
-   volatile long value = 0;
-   long data = 0;
-   long* volatile ptr = &data;
-
-   InterlockedIncrement(&value);
-   MemoryBarrier();
-   InterlockedDecrement(&value);
-
-   if (0 != InterlockedCompareExchange(&value, 1, 0))
-      return EXIT_FAILURE;
-
-   if (ptr != InterlockedCompareExchangePointer((PVOID volatile*)&ptr, (PVOID)ptr, (PVOID)ptr))
-      return EXIT_FAILURE;
-
-   return EXIT_SUCCESS;
-}
-" _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED)
-
-CHECK_CXX_SOURCE_RUNS("
-#include <libkern/OSAtomic.h>
-
-int main()
-{
-  volatile int32_t value = 0;
-  long data = 0;
-  long * volatile ptr = &data;
-  
-  OSAtomicIncrement32(&value);
-  OSMemoryBarrier();
-  OSAtomicDecrement32(&value);
-  OSAtomicCompareAndSwapInt(value, 1, &value);
-  OSAtomicCompareAndSwapPtr(ptr, ptr, (void * volatile *)&ptr);
-}
-" _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
-
-
-IF(NOT _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS AND NOT _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS AND NOT _OPENTHREADS_ATOMIC_USE_SUN AND NOT _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED AND NOT _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
-  SET(_OPENTHREADS_ATOMIC_USE_MUTEX 1)
-ENDIF(NOT _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS AND NOT _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS AND NOT _OPENTHREADS_ATOMIC_USE_SUN AND NOT _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED AND NOT _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)

CMakeModules/Find3rdPartyDependencies.cmake

@@ -5,8 +5,8 @@
 
 MACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES SEARCHPATHLIST DEBUGSUFFIX)
 
-    MESSAGE(STATUS "searching ${DEPNAME} -->${INCLUDEFILE}<-->${LIBRARY_NAMES}<-->${SEARCHPATHLIST}<--")
-
+    MESSAGE(STATUS "searching ${DEPNAME} -->${INCLUDEFILE}<-->${LIBRARY}<-->${SEARCHPATHLIST}<--")
+    
     SET(MY_PATH_INCLUDE )
     SET(MY_PATH_LIB )
     
@@ -14,10 +14,9 @@ MACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES SEARCHPATHLIST DEBUGSUFF
         SET(MY_PATH_INCLUDE ${MY_PATH_INCLUDE} ${MYPATH}/include)
         SET(MY_PATH_LIB ${MY_PATH_LIB} ${MYPATH}/lib)
     ENDFOREACH( MYPATH ${SEARCHPATHLIST} )
-    
+        
     FIND_PATH("${DEPNAME}_INCLUDE_DIR" ${INCLUDEFILE}
       ${MY_PATH_INCLUDE}
-      NO_DEFAULT_PATH
     )
     MARK_AS_ADVANCED("${DEPNAME}_INCLUDE_DIR")
     #MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--")
@@ -25,7 +24,6 @@ MACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES SEARCHPATHLIST DEBUGSUFF
     FIND_LIBRARY("${DEPNAME}_LIBRARY" 
         NAMES ${LIBRARY_NAMES}
       PATHS ${MY_PATH_LIB}
-      NO_DEFAULT_PATH
     )
     SET(LIBRARY_NAMES_DEBUG "")
     FOREACH(LIBNAME ${LIBRARY_NAMES})
@@ -34,7 +32,6 @@ MACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES SEARCHPATHLIST DEBUGSUFF
     FIND_LIBRARY("${DEPNAME}_LIBRARY_DEBUG" 
         NAMES ${LIBRARY_NAMES_DEBUG}
       PATHS ${MY_PATH_LIB}
-      NO_DEFAULT_PATH
     )
     MARK_AS_ADVANCED("${DEPNAME}_LIBRARY")
     #MESSAGE( " ${DEPNAME}_LIBRARY --> ${${DEPNAME}_LIBRARY}<--")
@@ -55,15 +52,13 @@ ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES SEARCHPATHLIST DEBUGS
 
 MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
         FIND_DEPENDENCY(TIFF tiff.h libtiff ${OSG_3RDPARTY_BIN} "D")
-        FIND_DEPENDENCY(FREETYPE ft2build.h "freetype;freetype234;freetype234MT;freetype235;freetype237" ${OSG_3RDPARTY_BIN} "_D")
+        FIND_DEPENDENCY(FREETYPE ft2build.h "freetype;freetype219;freetype234;freetype234MT" ${OSG_3RDPARTY_BIN} "_D")
         IF(FREETYPE_FOUND)
             #forcing subsequent FindFreeType stuff to not search for other variables.... kind of a hack 
-            SET(FREETYPE_INCLUDE_DIR_ft2build ${FREETYPE_INCLUDE_DIR} CACHE PATH "" FORCE)
-            SET(FREETYPE_INCLUDE_DIR_freetype2 ${FREETYPE_INCLUDE_DIR} CACHE PATH "" FORCE)
+            SET(FREETYPE_INCLUDE_DIR_ft2build ${FREETYPE_INCLUDE_DIR} CACHE PATH "")
+            SET(FREETYPE_INCLUDE_DIR_freetype2 ${FREETYPE_INCLUDE_DIR} CACHE PATH "")
             MARK_AS_ADVANCED(FREETYPE_INCLUDE_DIR_ft2build FREETYPE_INCLUDE_DIR_freetype2)
-            SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
         ENDIF(FREETYPE_FOUND)
-        FIND_DEPENDENCY(CURL curl/curl.h "libcurl;curllib" ${OSG_3RDPARTY_BIN} "D")
         FIND_DEPENDENCY(JPEG jpeglib.h libjpeg ${OSG_3RDPARTY_BIN} "D")
         #FIND_DEPENDENCY(GDAL gdal.h "gdal;gdal_i" ${OSG_3RDPARTY_BIN})
         FIND_DEPENDENCY(GLUT GL/glut.h glut32 ${OSG_3RDPARTY_BIN} "D")

CMakeModules/FindCOLLADA.cmake

@@ -1,22 +1,15 @@
-# Locate Collada
-# This module defines:
+# Locate gdal
+# This module defines
+# COLLADA_LIBRARY
+# COLLADA_FOUND, if false, do not try to link to gdal 
 # COLLADA_INCLUDE_DIR, where to find the headers
 #
-# COLLADA_LIBRARY, COLLADA_LIBRARY_DEBUG
-# COLLADA_FOUND, if false, do not try to link to Collada dynamically
-#
-# COLLADA_LIBRARY_STATIC, COLLADA_LIBRARY_STATIC_DEBUG
-# COLLADA_STATIC_FOUND, if false, do not try to link to Collada statically
-#
 # $COLLADA_DIR is an environment variable that would
 # correspond to the ./configure --prefix=$COLLADA_DIR
 #
 # Created by Robert Osfield. 
 
-SET(COLLADA_DOM_ROOT "$ENV{COLLADA_DIR}/dom" CACHE PATH "Location of Collada DOM directory")
-
 FIND_PATH(COLLADA_INCLUDE_DIR dae.h
-    ${COLLADA_DOM_ROOT}/include
     $ENV{COLLADA_DIR}/include
     $ENV{COLLADA_DIR}
     $ENV{OSGDIR}/include
@@ -25,9 +18,7 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
     ~/Library/Frameworks
     /Library/Frameworks
     /usr/local/include
-    /usr/local/include/colladadom
-    /usr/include/
-    /usr/include/colladadom
+    /usr/include
     /sw/include # Fink
     /opt/local/include # DarwinPorts
     /opt/csw/include # Blastwave
@@ -36,11 +27,9 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
     /usr/freeware/include
 )
 
-FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY 
-    NAMES collada_dom collada14dom libcollada14dom21
+FIND_LIBRARY(COLLADA_LIBRARY 
+    NAMES collada_dom
     PATHS
-    ${COLLADA_DOM_ROOT}/build/vc8-1.4
-    $ENV{COLLADA_DIR}/build/vc8-1.4
     $ENV{COLLADA_DIR}/lib
     $ENV{COLLADA_DIR}/lib-dbg
     $ENV{COLLADA_DIR}
@@ -50,9 +39,7 @@ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY
     ~/Library/Frameworks
     /Library/Frameworks
     /usr/local/lib
-    /usr/local/lib64
     /usr/lib
-    /usr/lib64
     /sw/lib
     /opt/local/lib
     /opt/csw/lib
@@ -61,216 +48,9 @@ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY
     /usr/freeware/lib64
 )
 
-FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY_DEBUG 
-    NAMES collada_dom-d collada14dom-d libcollada14dom21-d
-    PATHS
-    ${COLLADA_DOM_ROOT}/build/vc8-1.4-d
-    $ENV{COLLADA_DIR}/build/vc8-1.4-d
-    $ENV{COLLADA_DIR}/lib
-    $ENV{COLLADA_DIR}/lib-dbg
-    $ENV{COLLADA_DIR}
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/lib
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib
-    /usr/local/lib64
-    /usr/lib
-    /usr/lib64
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    /usr/freeware/lib64
-)
-
-FIND_LIBRARY(COLLADA_STATIC_LIBRARY 
-    NAMES libcollada14dom21-s
-    PATHS
-    ${COLLADA_DOM_ROOT}/build/vc8-1.4
-    $ENV{COLLADA_DIR}/build/vc8-1.4
-    $ENV{COLLADA_DIR}/lib
-    $ENV{COLLADA_DIR}/lib-dbg
-    $ENV{COLLADA_DIR}
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/lib
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib
-    /usr/local/lib64
-    /usr/lib
-    /usr/lib64
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    /usr/freeware/lib64
-)
-
-FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG 
-    NAMES collada_dom-sd collada14dom-sd libcollada14dom21-sd
-    PATHS
-    ${COLLADA_DOM_ROOT}/build/vc8-1.4-d
-    $ENV{COLLADA_DIR}/build/vc8-1.4-d
-    $ENV{COLLADA_DIR}/lib
-    $ENV{COLLADA_DIR}/lib-dbg
-    $ENV{COLLADA_DIR}
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/lib
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib
-    /usr/local/lib64
-    /usr/lib
-    /usr/lib64
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    /usr/freeware/lib64
-)
-
-IF(COLLADA_STATIC_LIBRARY)
-
-    # find extra libraries that the static linking requires
-
-    FIND_PACKAGE(LibXml2)
-    IF (LIBXML2_FOUND)
-        SET(COLLADA_LIBXML_LIBRARY ${LIBXML2_LIBRARIES})
-    ELSE(LIBXML2_FOUND)
-        IF(WIN32)
-            FIND_LIBRARY(COLLADA_LIBXML_LIBRARY
-                NAMES libxml2
-                PATHS
-                ${COLLADA_DOM_ROOT}/external-libs/libxml2/win32/lib
-                ${COLLADA_DOM_ROOT}/external-libs/libxml2/mingw/lib
-            )
-        ENDIF(WIN32)
-    ENDIF(LIBXML2_FOUND)
-    
-    FIND_PACKAGE(ZLIB)
-    IF (ZLIB_FOUND)
-        SET(COLLADA_ZLIB_LIBRARY ${ZLIB_LIBRARY})
-    ELSE(ZLIB_FOUND)
-        IF(WIN32)
-            FIND_LIBRARY(COLLADA_ZLIB_LIBRARY
-                NAMES zlib
-                PATHS
-                ${COLLADA_DOM_ROOT}/external-libs/libxml2/win32/lib
-                ${COLLADA_DOM_ROOT}/external-libs/libxml2/mingw/lib
-            )
-        ENDIF(WIN32)
-    ENDIF(ZLIB_FOUND)
-
-    IF(WIN32)
-
-        FIND_LIBRARY(COLLADA_PCRECPP_LIBRARY
-            NAMES pcrecpp
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc8    
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc9
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mac
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw    
-        )
-
-        FIND_LIBRARY(COLLADA_PCRECPP_LIBRARY_DEBUG 
-            NAMES pcrecpp-d
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc8    
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc9
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mac
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw    
-        )
-
-        FIND_LIBRARY(COLLADA_PCRE_LIBRARY
-            NAMES pcre
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc8    
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc9
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mac
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw    
-        )
-
-        FIND_LIBRARY(COLLADA_PCRE_LIBRARY_DEBUG 
-            NAMES pcre-d
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc8    
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/vc9
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mac
-            ${COLLADA_DOM_ROOT}/external-libs/pcre/lib/mingw
-        )
-
-        FIND_LIBRARY(COLLADA_MINIZIP_LIBRARY
-            NAMES minizip
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/minizip/win32/lib
-            ${COLLADA_DOM_ROOT}/external-libs/minizip/mac
-        )
-
-        FIND_LIBRARY(COLLADA_MINIZIP_LIBRARY_DEBUG
-            NAMES minizip-d
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/minizip/win32/lib
-            ${COLLADA_DOM_ROOT}/external-libs/minizip/mac
-        )
-    
-    ENDIF(WIN32)
-
-ENDIF(COLLADA_STATIC_LIBRARY)
-
-IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)
-
-    IF(WIN32)
-    
-        FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY
-            NAMES libboost_filesystem
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc8
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc9
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
-        )
-
-        FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY_DEBUG
-            NAMES libboost_filesystem-d
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc8
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc9
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
-        )
-
-        FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY
-            NAMES libboost_system
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc8
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc9
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
-        )
-
-        FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY_DEBUG
-            NAMES libboost_system-d
-            PATHS
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc8
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/vc9
-            ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
-        )
-
-      FIND_PATH(COLLADA_BOOST_INCLUDE_DIR boost/filesystem/convenience.hpp
-        ${COLLADA_DOM_ROOT}/external-libs/boost
-      ) 
-
-    ENDIF(WIN32)
-
-ENDIF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)
-
 SET(COLLADA_FOUND "NO")
-IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)
-    IF   (COLLADA_INCLUDE_DIR)
-        SET(COLLADA_FOUND "YES")
-    ENDIF(COLLADA_INCLUDE_DIR)
-ENDIF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)
+IF(COLLADA_LIBRARY AND COLLADA_INCLUDE_DIR)
+    SET(COLLADA_FOUND "YES")
+ENDIF(COLLADA_LIBRARY AND COLLADA_INCLUDE_DIR)
+
+

CMakeModules/FindFreeType.cmake

@@ -25,93 +25,55 @@
 # I'm going to attempt to cut out the middleman and hope 
 # everything still works.
 FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-  PATHS
-  $ENV{FREETYPE_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include    
-)
-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
-  PATHS
-  /usr/local
-  /usr
-  /usr/local/X11R6
-  /usr/local/X11
-  /usr/X11R6
-  /usr/X11
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-  /usr/freeware
-  PATH_SUFFIXES include
+    $ENV{FREETYPE_DIR}
+    /usr/local/include
+    /usr/include
+    /usr/local/X11R6
+    /usr/X11R6/include
+    /sw/include
+    /opt/local/include
+    /opt/csw/include
+    /opt/include
+    /usr/freeware/include/freetype2
 )
 
 FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-  $ENV{FREETYPE_DIR}/include/freetype2
-  NO_DEFAULT_PATH
-)
-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include/freetype2
-)
-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
-  /usr/local/include/freetype2
-  /usr/include/freetype2
-  /usr/local/X11R6/include/freetype2
-  /usr/local/X11/include/freetype2
-  /usr/X11R6/include/freetype2
-  /usr/X11/include/freetype2
-  /sw/include/freetype2
-  /opt/local/include/freetype2
-  /opt/csw/include/freetype2
-  /opt/include/freetype2
-  /usr/freeware/include/freetype2
+    $ENV{FREETYPE_DIR}/include/freetype2
+    /usr/local/include/freetype2
+    /usr/include/freetype2
+    /usr/local/X11R6/include/freetype2
+    /usr/X11R6/include/freetype2
+    /sw/include/freetype2
+    /opt/local/include/freetype2
+    /opt/csw/include/freetype2
+    /opt/include/freetype2
+    /usr/freeware/include/freetype2
 )
 
 FIND_LIBRARY(FREETYPE_LIBRARY 
-  NAMES freetype libfreetype freetype219
-  PATHS
-  $ENV{FREETYPE_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib 
-)
-FIND_LIBRARY(FREETYPE_LIBRARY 
-  NAMES freetype libfreetype freetype219
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib 
-)
-FIND_LIBRARY(FREETYPE_LIBRARY 
-  NAMES freetype libfreetype freetype219
-  PATHS
-  /usr/local
-  /usr
-  /usr/local/X11R6
-  /usr/local/X11
-  /usr/X11R6
-  /usr/X11
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-  /usr/freeware
-  PATH_SUFFIXES lib64 lib
+    NAMES freetype libfreetype freetype219
+    PATHS
+    $ENV{FREETYPE_DIR}/lib
+    $ENV{FREETYPE_DIR}/lib
+    /usr/local/lib
+    /usr/lib
+    /usr/local/X11R6/lib
+    /usr/X11R6/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/csw/lib
+    /opt/lib
+    /usr/freeware/lib64
 )
 
 IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
-  SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
+    SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
 ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
 
 
 SET(FREETYPE_FOUND "NO")
 IF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)
-  SET(FREETYPE_FOUND "YES")
+    SET(FREETYPE_FOUND "YES")
 ENDIF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)
 
 

CMakeModules/FindGDAL.cmake

@@ -4,91 +4,55 @@
 # GDAL_FOUND, if false, do not try to link to gdal 
 # GDAL_INCLUDE_DIR, where to find the headers
 #
-# $GDALDIR is an environment variable that would
+# $GDAL_DIR is an environment variable that would
 # correspond to the ./configure --prefix=$GDAL_DIR
-# used in building gdal.
 #
-# Created by Eric Wing. I'm not a gdal user, but OpenSceneGraph uses it 
-# for osgTerrain so I whipped this module together for completeness.
-# I actually don't know the conventions or where files are typically
-# placed in distros.
-# Any real gdal users are encouraged to correct this (but please don't
-# break the OS X framework stuff when doing so which is what usually seems 
-# to happen).
-
-# This makes the presumption that you are include gdal.h like
-# #include "gdal.h"
+# Created by Robert Osfield. 
 
 FIND_PATH(GDAL_INCLUDE_DIR gdal.h
-  PATHS
-  $ENV{GDAL_DIR}
-  NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-)
-
-FIND_PATH(GDAL_INCLUDE_DIR gdal.h
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-)
-
-FIND_PATH(GDAL_INCLUDE_DIR gdal.h
-  PATHS
-  ~/Library/Frameworks/gdal.framework/Headers
-  /Library/Frameworks/gdal.framework/Headers
-  /usr/local/include/gdal
-  /usr/local/include/GDAL
-  /usr/local/include
-  /usr/include/gdal
-  /usr/include/GDAL
-  /usr/include
-  /sw/include/gdal 
-  /sw/include/GDAL 
-  /sw/include # Fink
-  /opt/local/include/gdal
-  /opt/local/include/GDAL
-  /opt/local/include # DarwinPorts
-  /opt/csw/include/gdal
-  /opt/csw/include/GDAL
-  /opt/csw/include # Blastwave
-  /opt/include/gdal
-  /opt/include/GDAL
-  /opt/include
-)
-
-FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
-  PATHS
-  $ENV{GDAL_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
-FIND_LIBRARY(GDAL_LIBRARY 
-  NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
-  PATHS
+    ${GDAL_DIR}/include
+    $ENV{GDAL_DIR}/include
+    $ENV{GDAL_DIR}
+    $ENV{OSGDIR}/include
+    $ENV{OSGDIR}
+    $ENV{OSG_ROOT}/include
     ~/Library/Frameworks
     /Library/Frameworks
-    /usr/local
-    /usr
-    /sw
-    /opt/local
-    /opt/csw
-    /opt
-    /usr/freeware
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;GDAL_ROOT]/lib
-  PATH_SUFFIXES lib64 lib
+    /usr/local/include
+    /usr/include
+    /usr/include/gdal
+    /sw/include # Fink
+    /opt/local/include # DarwinPorts
+    /opt/csw/include # Blastwave
+    /opt/include
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+    /usr/freeware/include
+)
+
+FIND_LIBRARY(GDAL_LIBRARY 
+    NAMES gdal gdal_i gdal1.4.0 gdal1.3.2
+    PATHS
+    ${GDAL_DIR}/lib
+    $ENV{GDAL_DIR}/lib
+    $ENV{GDAL_DIR}
+    $ENV{OSGDIR}/lib
+    $ENV{OSGDIR}
+    $ENV{OSG_ROOT}/lib
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/lib
+    /usr/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/csw/lib
+    /opt/lib
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+    /usr/freeware/lib64
 )
 
 SET(GDAL_FOUND "NO")
 IF(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
-  SET(GDAL_FOUND "YES")
+    SET(GDAL_FOUND "YES")
 ENDIF(GDAL_LIBRARY AND GDAL_INCLUDE_DIR)
 
 
-

CMakeModules/FindGIFLIB.cmake

@@ -1,74 +1,56 @@
+# Locate gdal
 # This module defines
 # GIFLIB_LIBRARY
-# GIFLIB_FOUND, if false, do not try to link 
+# GIFLIB_FOUND, if false, do not try to link to gdal 
 # GIFLIB_INCLUDE_DIR, where to find the headers
 #
 # $GIFLIB_DIR is an environment variable that would
 # correspond to the ./configure --prefix=$GIFLIB_DIR
+# used in building gdal.
 #
 # Created by Eric Wing. 
 
 FIND_PATH(GIFLIB_INCLUDE_DIR gif_lib.h
-  PATHS
-  $ENV{GIFLIB_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
-
-FIND_PATH(GIFLIB_INCLUDE_DIR gif_lib.h
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES include
-)
-
-FIND_PATH(GIFLIB_INCLUDE_DIR gif_lib.h
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local/include
-  /usr/include
-  /sw/include # Fink
-  /opt/local/include # DarwinPorts
-  /opt/csw/include # Blastwave
-  /opt/include
-  [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-  /usr/freeware/include
+    $ENV{GIFLIB_DIR}/include
+    $ENV{GIFLIB_DIR}
+    $ENV{OSGDIR}/include
+    $ENV{OSGDIR}
+    $ENV{OSG_ROOT}/include
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/include
+    /usr/include
+    /sw/include # Fink
+    /opt/local/include # DarwinPorts
+    /opt/csw/include # Blastwave
+    /opt/include
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+    /usr/freeware/include
 )
 
 FIND_LIBRARY(GIFLIB_LIBRARY 
-  NAMES gif ungif libgif libungif
-  PATHS
-  $ENV{GIFLIB_DIR}
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(GIFLIB_LIBRARY 
-  NAMES gif ungif libgif libungif
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-  NO_DEFAULT_PATH
-  PATH_SUFFIXES lib64 lib
-)
-
-FIND_LIBRARY(GIFLIB_LIBRARY 
-  NAMES gif ungif libgif libungif
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local
-  /usr
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-  [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]
-  /usr/freeware
-  PATH_SUFFIXES lib64 lib
+    NAMES gif ungif libgif libungif
+    PATHS
+    $ENV{GIFLIB_DIR}/lib
+    $ENV{GIFLIB_DIR}
+    $ENV{OSGDIR}/lib
+    $ENV{OSGDIR}
+    $ENV{OSG_ROOT}/lib
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/lib
+    /usr/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/csw/lib
+    /opt/lib
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+    /usr/freeware/lib64
 )
 
 SET(GIFLIB_FOUND "NO")
 IF(GIFLIB_LIBRARY AND GIFLIB_INCLUDE_DIR)
-  SET(GIFLIB_FOUND "YES")
+    SET(GIFLIB_FOUND "YES")
 ENDIF(GIFLIB_LIBRARY AND GIFLIB_INCLUDE_DIR)
 
 

CMakeModules/FindInventor.cmake

@@ -53,7 +53,7 @@ FIND_LIBRARY(INVENTOR_LIBRARY_DEBUG
 )
 IF(NOT INVENTOR_LIBRARY_DEBUG)
     IF(INVENTOR_LIBRARY)
-        SET(INVENTOR_LIBRARY_DEBUG ${INVENTOR_LIBRARY})
+        SET(INVENTOR_LIBRARY_DEBUG INVENTOR_LIBRARY)
     ENDIF(INVENTOR_LIBRARY)
 ENDIF(NOT INVENTOR_LIBRARY_DEBUG)
 

CMakeModules/FindLibVNCServer.cmake

@@ -1,74 +0,0 @@
-# Locate libvncserver
-# This module defines
-# LIBVNCSERVER_LIBRARY
-# LIBVNCSERVER_FOUND, if false, do not try to link to libvncserver 
-# LIBVNCSERVER_INCLUDE_DIR, where to find the headers
-#
-# $LIBVNCSERVER_DIR is an environment variable that would
-# correspond to the ./configure --prefix=$LIBVNCSERVER_DIR
-# used in building libvncserver.
-
-FIND_PATH(LIBVNCSERVER_INCLUDE_DIR rfb/rfb.h
-    $ENV{LIBVNCSERVER_DIR}/include
-    $ENV{LIBVNCSERVER_DIR}
-    $ENV{OSGDIR}/include
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/include
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include
-    /usr/include
-    /sw/include # Fink
-    /opt/local/include # DarwinPorts
-    /opt/csw/include # Blastwave
-    /opt/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-    /usr/freeware/include
-)
-
-FIND_LIBRARY(LIBVNCCLIENT_LIBRARY 
-    NAMES vncclient
-    PATHS
-    $ENV{LIBVNCSERVER_DIR}/lib
-    $ENV{LIBVNCSERVER_DIR}
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/lib
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    /usr/freeware/lib64
-)
-
-FIND_LIBRARY(LIBVNCSERVER_LIBRARY 
-    NAMES vncserver
-    PATHS
-    $ENV{LIBVNCSERVER_DIR}/lib
-    $ENV{LIBVNCSERVER_DIR}
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/lib
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    /usr/freeware/lib64
-)
-
-SET(LIBVNCSERVER_FOUND "NO")
-IF(LIBVNCSERVER_LIBRARY AND LIBVNCSERVER_INCLUDE_DIR)
-    SET(LIBVNCSERVER_FOUND "YES")
-ENDIF(LIBVNCSERVER_LIBRARY AND LIBVNCSERVER_INCLUDE_DIR)
-
-

CMakeModules/FindOSG.cmake

@@ -10,42 +10,37 @@
 # Created by Robert Osfield. 
 
 FIND_PATH(OSG_INCLUDE_DIR osg/Node
-    ${OSG_DIR}/include
     $ENV{OSG_DIR}/include
     $ENV{OSG_DIR}
     $ENV{OSGDIR}/include
     $ENV{OSGDIR}
     $ENV{OSG_ROOT}/include
-    NO_DEFAULT_PATH
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/include
+    /usr/include
+    /sw/include # Fink
+    /opt/local/include # DarwinPorts
+    /opt/csw/include # Blastwave
+    /opt/include
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+    /usr/freeware/include
 )
 
-FIND_PATH(OSG_INCLUDE_DIR osg/Node)
-
 MACRO(FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME)
 
-    FIND_LIBRARY("${MYLIBRARY}_DEBUG"
-        NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
+    FIND_LIBRARY(${MYLIBRARY}
+        NAMES ${MYLIBRARYNAME}
         PATHS
-        ${OSG_DIR}/lib/Debug
-        ${OSG_DIR}/lib
-        $ENV{OSG_DIR}/lib/debug
         $ENV{OSG_DIR}/lib
         $ENV{OSG_DIR}
         $ENV{OSGDIR}/lib
         $ENV{OSGDIR}
         $ENV{OSG_ROOT}/lib
-        NO_DEFAULT_PATH
-    )
-
-    FIND_LIBRARY("${MYLIBRARY}_DEBUG"
-        NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
-        PATHS
         ~/Library/Frameworks
         /Library/Frameworks
         /usr/local/lib
-        /usr/local/lib64
         /usr/lib
-        /usr/lib64
         /sw/lib
         /opt/local/lib
         /opt/csw/lib
@@ -53,57 +48,16 @@ MACRO(FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME)
         [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
         /usr/freeware/lib64
     )
-    
-    FIND_LIBRARY(${MYLIBRARY}
-        NAMES ${MYLIBRARYNAME}
-        PATHS
-        ${OSG_DIR}/lib/Release
-        ${OSG_DIR}/lib
-        $ENV{OSG_DIR}/lib/Release
-        $ENV{OSG_DIR}/lib
-        $ENV{OSG_DIR}
-        $ENV{OSGDIR}/lib
-        $ENV{OSGDIR}
-        $ENV{OSG_ROOT}/lib
-        NO_DEFAULT_PATH
-    )
 
-    FIND_LIBRARY(${MYLIBRARY}
-        NAMES ${MYLIBRARYNAME}
-        PATHS
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib
-        /usr/local/lib64
-        /usr/lib
-        /usr/lib64
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
-        /opt/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-        /usr/freeware/lib64
-    )
-    
-    IF( NOT ${MYLIBRARY}_DEBUG)
-        IF(MYLIBRARY)
-            SET(${MYLIBRARY}_DEBUG ${MYLIBRARY})
-         ENDIF(MYLIBRARY)
-    ENDIF( NOT ${MYLIBRARY}_DEBUG)
-           
 ENDMACRO(FIND_OSG_LIBRARY LIBRARY LIBRARYNAME)
 
 FIND_OSG_LIBRARY(OSG_LIBRARY osg)
-FIND_OSG_LIBRARY(OSGGA_LIBRARY osgGA)
 FIND_OSG_LIBRARY(OSGUTIL_LIBRARY osgUtil)
 FIND_OSG_LIBRARY(OSGDB_LIBRARY osgDB)
 FIND_OSG_LIBRARY(OSGTEXT_LIBRARY osgText)
-FIND_OSG_LIBRARY(OSGWIDGET_LIBRARY osgWidget)
 FIND_OSG_LIBRARY(OSGTERRAIN_LIBRARY osgTerrain)
 FIND_OSG_LIBRARY(OSGFX_LIBRARY osgFX)
 FIND_OSG_LIBRARY(OSGVIEWER_LIBRARY osgViewer)
-FIND_OSG_LIBRARY(OSGVOLUME_LIBRARY osgVolume)
-FIND_OSG_LIBRARY(OPENTHREADS_LIBRARY OpenThreads)
 
 SET(OSG_FOUND "NO")
 IF(OSG_LIBRARY AND OSG_INCLUDE_DIR)

CMakeModules/FindOpenEXR.cmake

@@ -1,77 +0,0 @@
-# Locate OpenEXR
-# This module defines
-# OPENEXR_LIBRARY
-# OPENEXR_FOUND, if false, do not try to link to OpenEXR 
-# OPENEXR_INCLUDE_DIR, where to find the headers
-#
-# $OPENEXR_DIR is an environment variable that would
-# correspond to the ./configure --prefix=$OPENEXR_DIR
-#
-# Created by Robert Osfield. 
-
-FIND_PATH(OPENEXR_INCLUDE_DIR OpenEXR/ImfIO.h
-    $ENV{OPENEXR_DIR}/include
-    $ENV{OPENEXR_DIR}
-    $ENV{OSGDIR}/include
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/include
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include
-    /usr/include
-    /sw/include # Fink
-    /opt/local/include # DarwinPorts
-    /opt/csw/include # Blastwave
-    /opt/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-    /usr/freeware/include
-)
-
-FIND_LIBRARY(OPENEXR_IlmIlf_LIBRARY 
-    NAMES IlmImf
-    PATHS
-    $ENV{OPENEXR_DIR}/lib
-    $ENV{OPENEXR_DIR}
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/lib
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    /usr/freeware/lib64
-)
-
-FIND_LIBRARY(OPENEXR_Half_LIBRARY 
-    NAMES Half
-    PATHS
-    $ENV{OPENEXR_DIR}/lib
-    $ENV{OPENEXR_DIR}
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/lib
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    /usr/freeware/lib64
-)
-
-SET(OPENEXR_FOUND "NO")
-IF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmIlf_LIBRARY AND OPENEXR_Half_LIBRARY)
-    SET(OPENEXR_LIBRARIES
-        ${OPENEXR_IlmIlf_LIBRARY}
-        ${OPENEXR_Half_LIBRARY}
-    )
-    SET(OPENEXR_FOUND "YES")
-ENDIF(OPENEXR_INCLUDE_DIR AND OPENEXR_IlmIlf_LIBRARY AND OPENEXR_Half_LIBRARY)

CMakeModules/FindOpenThreads.cmake

@@ -43,36 +43,36 @@
 # may change.
 
 FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
-    PATHS
     $ENV{OPENTHREADS_INCLUDE_DIR}
     $ENV{OPENTHREADS_DIR}/include
     $ENV{OPENTHREADS_DIR}
     $ENV{OSG_INCLUDE_DIR}
     $ENV{OSG_DIR}/include
     $ENV{OSG_DIR}
-    $ENV{OSGDIR}/include
-    $ENV{OSGDIR}
     NO_DEFAULT_PATH
 )
 
-FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-)
+IF(NOT OPENTHREADS_INCLUDE_DIR)
+    FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
+        PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+        PATH_SUFFIXES include
+    )
+ENDIF(NOT OPENTHREADS_INCLUDE_DIR)
 
-FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include
-    /usr/include
-    /sw/include # Fink
-    /opt/local/include # DarwinPorts
-    /opt/csw/include # Blastwave
-    /opt/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-)
+IF(NOT OPENTHREADS_INCLUDE_DIR)
+    FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread
+        ~/Library/Frameworks
+        /Library/Frameworks
+        /usr/local/include
+        /usr/include
+        /sw/include # Fink
+        /opt/local/include # DarwinPorts
+        /opt/csw/include # Blastwave
+        /opt/include
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+    )
+ENDIF(NOT OPENTHREADS_INCLUDE_DIR)
 
 
 FIND_LIBRARY(OPENTHREADS_LIBRARY 
@@ -86,39 +86,39 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY
     $ENV{OSG_DIR}/lib64
     $ENV{OSG_DIR}/lib
     $ENV{OSG_DIR}
-    $ENV{OSGDIR}/lib64
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
     NO_DEFAULT_PATH
 )
 
-FIND_LIBRARY(OPENTHREADS_LIBRARY 
-    NAMES OpenThreads OpenThreadsWin32 
-  PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+IF(NOT OPENTHREADS_LIBRARY)
+    FIND_LIBRARY(OPENTHREADS_LIBRARY 
+        NAMES OpenThreads OpenThreadsWin32 
+        PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+        PATH_SUFFIXES lib64 lib
+    )
+ENDIF(NOT OPENTHREADS_LIBRARY)
 
-FIND_LIBRARY(OPENTHREADS_LIBRARY 
-    NAMES OpenThreads OpenThreadsWin32 
-    PATHS
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib64
-    /usr/local/lib
-    /usr/lib64
-    /usr/lib
-    /sw/lib64
-    /sw/lib
-    /opt/local/lib64
-    /opt/local/lib
-    /opt/csw/lib64
-    /opt/csw/lib
-    /opt/lib64
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-)
+IF(NOT OPENTHREADS_LIBRARY)
+    FIND_LIBRARY(OPENTHREADS_LIBRARY 
+        NAMES OpenThreads OpenThreadsWin32 
+        PATHS
+        ~/Library/Frameworks
+        /Library/Frameworks
+        /usr/local/lib64
+        /usr/local/lib
+        /usr/lib64
+        /usr/lib
+        /sw/lib64
+        /sw/lib
+        /opt/local/lib64
+        /opt/local/lib
+        /opt/csw/lib64
+        /opt/csw/lib
+        /opt/lib64
+        /opt/lib
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+    )
+ENDIF(NOT OPENTHREADS_LIBRARY)
 
 
 FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
@@ -133,37 +133,40 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
     $ENV{OSG_DIR}/lib64
     $ENV{OSG_DIR}/lib
     $ENV{OSG_DIR}
-    $ENV{OSGDIR}/lib64
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
+    ${CMAKE_PREFIX_PATH}/lib64
+    ${CMAKE_PREFIX_PATH}/lib
+    ${CMAKE_PREFIX_PATH}
     NO_DEFAULT_PATH
 )
 
-FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
-    NAMES OpenThreadsd OpenThreadsWin32d
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-)
+IF(NOT OPENTHREADS_LIBRARY_DEBUG)
+    FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
+        NAMES OpenThreadsd OpenThreadsWin32d
+        PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+        PATH_SUFFIXES lib64 lib
+    )
+ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)
 
-FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
-    NAMES OpenThreadsd OpenThreadsWin32d
-    PATHS
-    /usr/local/lib64
-    /usr/local/lib
-    /usr/lib64
-    /usr/lib
-    /sw/lib64
-    /sw/lib
-    /opt/local/lib64
-    /opt/local/lib
-    /opt/csw/lib64
-    /opt/csw/lib
-    /opt/lib64
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-)
+IF(NOT OPENTHREADS_LIBRARY_DEBUG)
+    FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
+        NAMES OpenThreadsd OpenThreadsWin32d
+        PATHS
+        /usr/local/lib64
+        /usr/local/lib
+        /usr/lib64
+        /usr/lib
+        /sw/lib64
+        /sw/lib
+        /opt/local/lib64
+        /opt/local/lib
+        /opt/csw/lib64
+        /opt/csw/lib
+        /opt/lib64
+        /opt/lib
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/lib
+        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+    )
+ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)
 
 
 IF(OPENTHREADS_LIBRARY)

CMakeModules/FindOurDCMTK.cmake

@@ -1,180 +0,0 @@
-# - find DCMTK libraries
-#
-
-#  DCMTK_INCLUDE_DIRS  - Directories to include to use DCMTK
-#  DCMTK_LIBRARIES     - Files to link against to use DCMTK
-#  DCMTK_FOUND         - If false, don't try to use DCMTK
-#  DCMTK_DIR           - (optional) Source directory for DCMTK
-#
-# DCMTK_DIR can be used to make it simpler to find the various include
-# directories and compiled libraries if you've just compiled it in the
-# source tree. Just set it to the root of the tree where you extracted
-# the source.
-#
-# Written for VXL by Amitha Perera.
-# Modified by Robert Osfied to enable support for install placements of DCMTK 3.5.4 versions onwards
-
-FIND_PATH( DCMTK_ROOT_INCLUDE_DIR dcmtk/config/osconfig.h
-    ${DCMTK_DIR}/config/include
-    ${DCMTK_DIR}/include
-    /usr/local/include/
-    /usr/include/
-    /usr/local/dicom/include/
-)
-
-FIND_PATH( DCMTK_config_INCLUDE_DIR osconfig.h
-    ${DCMTK_ROOT_INCLUDE_DIR}/dcmtk/config
-    ${DCMTK_DIR}/config/include
-    ${DCMTK_DIR}/include
-    /usr/local/include/dcmtk/config
-    /usr/include/dcmtk/config
-    /usr/local/dicom/include/dcmtk/config
-)
-
-FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h
-    ${DCMTK_ROOT_INCLUDE_DIR}/dcmtk/ofstd
-    ${DCMTK_DIR}/ofstd/include
-    ${DCMTK_DIR}/include/ofstd
-    /usr/local/include/dcmtk/ofstd
-    /usr/include/dcmtk/ofstd
-    /usr/local/dicom/include/dcmtk/ofstd
-)
-
-FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd
-    ${DCMTK_DIR}/ofstd/libsrc
-    ${DCMTK_DIR}/ofstd/libsrc/Release
-    ${DCMTK_DIR}/ofstd/libsrc/Debug
-    ${DCMTK_DIR}/ofstd/Release
-    ${DCMTK_DIR}/ofstd/Debug
-    ${DCMTK_DIR}/lib
-    /usr/local/lib64
-    /usr/lib64
-    /usr/local/lib
-    /usr/lib
-    /usr/local/dicom/lib
-)
-
-
-FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h
-    ${DCMTK_ROOT_INCLUDE_DIR}/dcmtk/dcmdata
-    ${DCMTK_DIR}/dcmdata/include
-    ${DCMTK_DIR}/include/dcmdata
-    /usr/local/include/dcmtk/dcmdata
-    /usr/include/dcmtk/dcmdata
-    /usr/local/dicom/include/dcmtk/dcmdata
-)
-
-FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata
-    ${DCMTK_DIR}/dcmdata/libsrc
-    ${DCMTK_DIR}/dcmdata/libsrc/Release
-    ${DCMTK_DIR}/dcmdata/libsrc/Debug
-    ${DCMTK_DIR}/dcmdata/Release
-    ${DCMTK_DIR}/dcmdata/Debug
-    ${DCMTK_DIR}/lib
-    /usr/local/lib64
-    /usr/lib64
-    /usr/local/lib
-    /usr/lib
-    /usr/local/dicom/lib
-)
-
-
-FIND_PATH( DCMTK_dcmimgle_INCLUDE_DIR dcmimage.h
-    ${DCMTK_ROOT_INCLUDE_DIR}/dcmtk/dcmimgle
-    ${DCMTK_DIR}/dcmimgle/include
-    ${DCMTK_DIR}/include/dcmimgle
-    /usr/local/include/dcmtk/dcmimgle
-    /usr/include/dcmtk/dcmimgle
-    /usr/local/dicom/include/dcmtk/dcmimgle
-)
-
-FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle
-    ${DCMTK_DIR}/dcmimgle/libsrc
-    ${DCMTK_DIR}/dcmimgle/libsrc/Release
-    ${DCMTK_DIR}/dcmimgle/libsrc/Debug
-    ${DCMTK_DIR}/dcmimgle/Release
-    ${DCMTK_DIR}/dcmimgle/Debug
-    ${DCMTK_DIR}/lib
-    /usr/local/lib64
-    /usr/lib64
-    /usr/local/lib
-    /usr/lib
-    /usr/local/dicom/lib
-)
-
-FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb
-    ${DCMTK_DIR}/imagectn/libsrc/Release
-    ${DCMTK_DIR}/imagectn/libsrc/
-    ${DCMTK_DIR}/imagectn/libsrc/Debug
-    /usr/local/lib64
-    /usr/lib64
-    /usr/local/lib
-    /usr/lib
-    /usr/local/dicom/lib
-)
-
-FIND_LIBRARY(DCMTK_dcmnet_LIBRARY dcmnet
-    ${DCMTK_DIR}/dcmnet/libsrc/Release
-    ${DCMTK_DIR}/dcmnet/libsrc/Debug
-    ${DCMTK_DIR}/dcmnet/libsrc/
-    /usr/local/lib64
-    /usr/lib64
-    /usr/local/lib
-    /usr/lib
-    /usr/local/dicom/lib
-)
-
-
-IF( DCMTK_config_INCLUDE_DIR
-    AND DCMTK_ofstd_INCLUDE_DIR
-    AND DCMTK_ofstd_LIBRARY
-    AND DCMTK_dcmdata_INCLUDE_DIR
-    AND DCMTK_dcmdata_LIBRARY
-    AND DCMTK_dcmimgle_INCLUDE_DIR
-    AND DCMTK_dcmimgle_LIBRARY )
-
-  SET( DCMTK_FOUND "YES" )
-  SET( DCMTK_INCLUDE_DIRS
-    ${DCMTK_config_INCLUDE_DIR}
-    ${DCMTK_ofstd_INCLUDE_DIR}
-    ${DCMTK_dcmdata_INCLUDE_DIR}
-    ${DCMTK_dcmimgle_INCLUDE_DIR}
-  )
-
-  SET( DCMTK_LIBRARIES
-    ${DCMTK_dcmimgle_LIBRARY}
-    ${DCMTK_dcmdata_LIBRARY}
-    ${DCMTK_ofstd_LIBRARY}
-    ${DCMTK_config_LIBRARY}
-  )
-
-  IF(DCMTK_imagedb_LIBRARY)
-   SET( DCMTK_LIBRARIES
-   ${DCMTK_LIBRARIES}
-   ${DCMTK_imagedb_LIBRARY}
-   )
-  ENDIF(DCMTK_imagedb_LIBRARY)
-
-  IF(DCMTK_dcmnet_LIBRARY)
-   SET( DCMTK_LIBRARIES
-   ${DCMTK_LIBRARIES}
-   ${DCMTK_dcmnet_LIBRARY}
-   )
-  ENDIF(DCMTK_dcmnet_LIBRARY)
-
-  IF( WIN32 )
-    SET( DCMTK_LIBRARIES ${DCMTK_LIBRARIES} netapi32 )
-  ENDIF( WIN32 )
-
-ENDIF( DCMTK_config_INCLUDE_DIR
-    AND DCMTK_ofstd_INCLUDE_DIR
-    AND DCMTK_ofstd_LIBRARY
-    AND DCMTK_dcmdata_INCLUDE_DIR
-    AND DCMTK_dcmdata_LIBRARY
-    AND DCMTK_dcmimgle_INCLUDE_DIR
-    AND DCMTK_dcmimgle_LIBRARY )
-
-IF( NOT DCMTK_FOUND )
-  SET( DCMTK_DIR "" CACHE PATH "Root of DCMTK source tree (optional)." )
-  MARK_AS_ADVANCED( DCMTK_DIR )
-ENDIF( NOT DCMTK_FOUND )

CMakeModules/FindQuickTime.cmake

@@ -6,6 +6,7 @@
 #
 # $QUICKTIME_DIR is an environment variable that would
 # correspond to the ./configure --prefix=$QUICKTIME_DIR
+# used in building gdal.
 #
 # Created by Eric Wing. 
 
@@ -13,37 +14,19 @@
 # so I am going to case the two.
 
 IF(APPLE)
-  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h)
-  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
+    FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h)
+    FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
 ELSE(APPLE)
-  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
-    $ENV{QUICKTIME_DIR}/include
-    $ENV{QUICKTIME_DIR}
-    NO_DEFAULT_PATH
-  )
-  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES include
-  )
-  FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h)
-
-  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime
-    $ENV{QUICKTIME_DIR}/lib
-    $ENV{QUICKTIME_DIR}
-    NO_DEFAULT_PATH
-  )
-  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime
-    PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-    NO_DEFAULT_PATH
-    PATH_SUFFIXES lib64 lib
-  )
-  FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
+    FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
+        $ENV{QUICKTIME_DIR}/include
+        $ENV{QUICKTIME_DIR}
+    )
+    FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
 ENDIF(APPLE)
 
 SET(QUICKTIME_FOUND "NO")
 IF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR)
-  SET(QUICKTIME_FOUND "YES")
+    SET(QUICKTIME_FOUND "YES")
 ENDIF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR)
 
 

CMakeModules/FindXUL.cmake

@@ -1,235 +0,0 @@
-# Locate XUL
-# This module defines
-# XUL_LIBRARIES
-# XUL_FOUND, if false, do not try to link to gdal
-# XUL_INCLUDE_DIR, where to find the headers
-#
-# $XUL_DIR is an environment variable that would
-# correspond to the ./configure --prefix=$XUL_DIR
-#
-# Created by Robert Osfield.
-
-#use pkg-config to find various modues
-INCLUDE(FindPkgConfig OPTIONAL)
-
-IF(PKG_CONFIG_FOUND)
-
-    INCLUDE(FindPkgConfig)
-
-    pkg_check_modules(XULRUNNER_XPCOM xulrunner-xpcom<=1.8.9)
-    pkg_check_modules(XULRUNNER_JS xulrunner-js)
-    pkg_check_modules(XULRUNNER_NSPR xulrunner-nspr)
-    pkg_check_modules(XULRUNNER_NSS xulrunner-nss)
-
-ENDIF(PKG_CONFIG_FOUND)
-
-# Added check to make sure that nsIBaseWindow.h is available, as it's not a standard part the of 1.8.x SDK
-FIND_PATH(NSIBASEWINDOW_INCLUDE_DIR widget/nsIBaseWindow.h
-    PATHS ${XULRUNNER_XPCOM_INCLUDE_DIRS}
-    $ENV{OSG_DIR}/include/xulrunner
-    $ENV{OSG_DIR}/include
-    $ENV{OSG_DIR}/xulrunner
-    $ENV{OSG_DIR}
-    $ENV{OSGDIR}/include/xulrunner
-    $ENV{OSGDIR}/include
-    $ENV{OSGDIR}/xulrunner
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/include/xulrunner
-    $ENV{OSG_ROOT}/include
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include/xulrunner
-    /usr/local/include
-    /usr/include/xulrunner
-    /usr/include
-    /sw/include/xulrunner # Fink
-    /sw/include # Fink
-    /opt/local/include/xulrunner # DarwinPorts
-    /opt/local/include # DarwinPorts
-    /opt/csw/include/xulrunner # Blastwave
-    /opt/csw/include # Blastwave
-    /opt/include/xulrunner
-    /opt/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include/xulrunner
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-    /usr/freeware/include/xulrunner
-    /usr/freeware/include
-)
-
-FIND_PATH(XUL_INCLUDE_DIR nsEmbedAPI.h
-    PATHS ${XULRUNNER_XPCOM_INCLUDE_DIRS}
-    $ENV{OSG_DIR}/include/xulrunner
-    $ENV{OSG_DIR}/include
-    $ENV{OSG_DIR}/xulrunner
-    $ENV{OSG_DIR}
-    $ENV{OSGDIR}/include/xulrunner
-    $ENV{OSGDIR}/include
-    $ENV{OSGDIR}/xulrunner
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/include/xulrunner
-    $ENV{OSG_ROOT}/include
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include/xulrunner
-    /usr/local/include
-    /usr/include/xulrunner
-    /usr/include
-    /sw/include/xulrunner # Fink
-    /sw/include # Fink
-    /opt/local/include/xulrunner # DarwinPorts
-    /opt/local/include # DarwinPorts
-    /opt/csw/include/xulrunner # Blastwave
-    /opt/csw/include # Blastwave
-    /opt/include/xulrunner
-    /opt/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include/xulrunner
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-    /usr/freeware/include/xulrunner
-    /usr/freeware/include
-)
-
-FIND_PATH(NSPR_INCLUDE_DIR prtypes.h
-    PATHS ${XULRUNNER_NSPR_INCLUDE_DIRS}
-    $ENV{OSG_DIR}/include/nspr
-    $ENV{OSG_DIR}/include
-    $ENV{OSG_DIR}/nspr
-    $ENV{OSG_DIR}
-    $ENV{OSGDIR}/include/nspr
-    $ENV{OSGDIR}/include
-    $ENV{OSGDIR}/nspr
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/include/nspr
-    $ENV{OSG_ROOT}/include
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include/nspr
-    /usr/local/include
-    /usr/include/nspr
-    /usr/include
-    /sw/include/nspr # Fink
-    /sw/include # Fink
-    /opt/local/include/nspr # DarwinPorts
-    /opt/local/include # DarwinPorts
-    /opt/csw/include/nspr # Blastwave
-    /opt/csw/include # Blastwave
-    /opt/include/nspr
-    /opt/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include/nspr
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-    /usr/freeware/include/nspr
-    /usr/freeware/include
-)
-
-FIND_PATH(MOZJS_INCLUDE_DIR jsapi.h
-    PATHS ${XULRUNNER_JS_INCLUDE_DIRS}
-    $ENV{OSG_DIR}/include/mozjs
-    $ENV{OSG_DIR}/include
-    $ENV{OSG_DIR}/mozjs
-    $ENV{OSG_DIR}
-    $ENV{OSGDIR}/include/mozjs
-    $ENV{OSGDIR}/include
-    $ENV{OSGDIR}/mozjs
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/include/mozjs
-    $ENV{OSG_ROOT}/include
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/include/mozjs
-    /usr/local/include
-    /usr/include/mozjs
-    /usr/include
-    /sw/include/mozjs # Fink
-    /sw/include # Fink
-    /opt/local/include/mozjs # DarwinPorts
-    /opt/local/include # DarwinPorts
-    /opt/csw/include/mozjs # Blastwave
-    /opt/csw/include # Blastwave
-    /opt/include/mozjs
-    /opt/include
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include/mozjs
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
-    /usr/freeware/include/mozjs
-    /usr/freeware/include
-)
-
-FIND_PATH(XUL_DIR
-    NAMES components/appshell.xpt
-    PATHS
-    $ENV{OSG_DIR}/lib
-    $ENV{OSG_DIR}
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/lib
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib/xulrunner
-    /usr/local/lib
-    /usr/lib/xulrunner
-    /usr/lib
-    /sw/lib/xulrunner
-    /sw/lib
-    /opt/local/lib/xulrunner
-    /opt/local/lib
-    /opt/csw/lib/xulrunner
-    /opt/csw/lib
-    /opt/lib/xulrunner
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    /usr/freeware/lib64/xulrunner
-    /usr/freeware/lib64
-)
-
-MACRO(FIND_XUL_LIBRARY MYLIBRARY MYLIBRARYNAME)
-
-    FIND_LIBRARY(${MYLIBRARY}
-        PATHS ${XULRUNNER_XPCOM_LIBRARY_DIRS}
-        PATHS ${XULRUNNER_JS_LIBRARY_DIRS}
-        PATHS ${XULRUNNER_NSPR_LIBRARY_DIRS}
-        PATHS ${XULRUNNER_NSS_LIBRARY_DIRS}
-        NAMES ${MYLIBRARYNAME}
-        PATHS
-        $ENV{OSG_DIR}/lib
-        $ENV{OSG_DIR}
-        $ENV{OSGDIR}/lib
-        $ENV{OSGDIR}
-        $ENV{OSG_ROOT}/lib
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib/xulrunner
-        /usr/local/lib
-        /usr/lib/xulrunner
-        /usr/lib
-        /sw/lib/xulrunner
-        /sw/lib
-        /opt/local/lib/xulrunner
-        /opt/local/lib
-        /opt/csw/lib/xulrunner
-        /opt/csw/lib
-        /opt/lib/xulrunner
-        /opt/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-        /usr/freeware/lib64/xulrunner
-        /usr/freeware/lib64
-    )
-
-ENDMACRO(FIND_XUL_LIBRARY LIBRARY LIBRARYNAME)
-
-
-FIND_XUL_LIBRARY(XUL_LIBRARY xul plds4 plc4 nspr4)
-FIND_XUL_LIBRARY(XUL_MOZJS_LIBRARY mozjs)
-FIND_XUL_LIBRARY(XUL_XPCOM_LIBRARY xpcom)
-FIND_XUL_LIBRARY(XUL_PLUGIN_LIBRARY plds4)
-FIND_XUL_LIBRARY(XUL_NSS_LIBRARY nss3)
-
-
-SET(XUL_FOUND "NO")
-IF(XUL_LIBRARY AND XUL_INCLUDE_DIR AND NSIBASEWINDOW_INCLUDE_DIR)
-
-    SET(XUL_FOUND "YES")
-    SET(XUL_LIBRARIES ${XUL_LIBRARY} ${XUL_MOZJS_LIBRARY} ${XUL_XPCOM_LIBRARY} ${XUL_PLUGIN_LIBRARY} ${XUL_NSS_LIBRARY})
-    SET(XUL_INCLUDE_DIRS ${XUL_INCLUDE_DIR} ${NSPR_INCLUDE_DIR} ${MOZJS_INCLUDE_DIR})
-
-ENDIF(XUL_LIBRARY AND XUL_INCLUDE_DIR AND NSIBASEWINDOW_INCLUDE_DIR)
-
-# MESSAGE("XUL_INCLUDE_DIR " ${XUL_INCLUDE_DIR})
-# MESSAGE("XUL_LIBRARIES " ${XUL_LIBRARIES})

CMakeModules/FindZLIB.cmake

@@ -1,12 +1,12 @@
-# Locate zlib
+# Locate gdal
 # This module defines
 # ZLIB_LIBRARY
-# ZLIB_FOUND, if false, do not try to link to zlib 
+# ZLIB_FOUND, if false, do not try to link to gdal 
 # ZLIB_INCLUDE_DIR, where to find the headers
 #
 # $ZLIB_DIR is an environment variable that would
 # correspond to the ./configure --prefix=$ZLIB_DIR
-# used in building zlib.
+# used in building gdal.
 #
 # Created by Ulrich Hertlein. 
 
@@ -29,7 +29,7 @@ FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
 )
 
 FIND_LIBRARY(ZLIB_LIBRARY 
-    NAMES z libz zlib
+    NAMES z libz
     PATHS
     $ENV{ZLIB_DIR}/lib
     $ENV{ZLIB_DIR}

CMakeModules/ModuleInstall.cmake

@@ -22,19 +22,17 @@ SOURCE_GROUP(
 )
 
 IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
-    HANDLE_MSVC_DLL()
+	HANDLE_MSVC_DLL()
 ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
 
 INSTALL(
     TARGETS ${LIB_NAME}
-    RUNTIME DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph
-    LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT libopenscenegraph
-    ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} COMPONENT libopenscenegraph-dev
+    RUNTIME DESTINATION ${INSTALL_BINDIR}
+    LIBRARY DESTINATION ${INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR}
 )
-
 # FIXME: Do not run for OS X framework
 INSTALL(
     FILES        ${LIB_PUBLIC_HEADERS}
     DESTINATION ${INSTALL_INCDIR}/${LIB_NAME}
-    COMPONENT libopenscenegraph-dev
 )

CMakeModules/OsgCPack.cmake

@@ -1,144 +0,0 @@
-# This script sets up packaging targets for each "COMPONENT" as specified in INSTALL commands
-#
-# for each component a CPackConfig-<component>.cmake is generated in the build tree
-# and a target is added to call cpack for it (e.g. package_openscenegaph
-# A target for generating a package with everything that gets INSTALLED is generated (package_openscenegraph-all)
-# A target for making all of the abaove packages is generated (package_ALL)
-#
-# package filenames are created on the form <package>-<platform>-<arch>[-<compiler>]-<build_type>[-static].tar.gz
-# ...where compiler optionally set using a cmake gui (OSG_CPACK_COMPILER). This script tries to guess compiler version for msvc generators
-# ...build_type matches CMAKE_BUILD_TYPE for all generators but the msvc ones
-
-# resolve architecture. The reason i "change" i686 to i386 is that debian packages
-# require i386 so this is for the future
-IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
-    SET(SYSTEM_ARCH "i386")
-ELSE()
-    SET(SYSTEM_ARCH ${CMAKE_SYSTEM_PROCESSOR})
-ENDIF()
-
-# set a default system name - use CMake setting (Linux|Windows|...)
-SET(SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
-#message(STATUS "CMAKE_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}")
-#message(STATUS "CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}")
-
-# for msvc the SYSTEM_NAME is set win32/64 instead of "Windows"
-IF(MSVC)
-    IF(CMAKE_CL_64)
-        SET(SYSTEM_NAME "win64")
-    ELSE()
-        SET(SYSTEM_NAME "win32")
-    ENDIF()
-ENDIF()
-# Guess the compiler (is this desired for other platforms than windows?)
-IF(NOT DEFINED OSG_CPACK_COMPILER)
-    INCLUDE(OsgDetermineCompiler)
-ENDIF()
-
-# expose the compiler setting to the user
-SET(OSG_CPACK_COMPILER "${OSG_COMPILER}" CACHE STRING "This ia short string (vc90, vc80sp1, gcc-4.3, ...) describing your compiler. The string is used for creating package filenames")
-
-IF(OSG_CPACK_COMPILER)
-  SET(OSG_CPACK_SYSTEM_SPEC_STRING ${SYSTEM_NAME}-${SYSTEM_ARCH}-${OSG_CPACK_COMPILER})
-ELSE()
-  SET(OSG_CPACK_SYSTEM_SPEC_STRING ${SYSTEM_NAME}-${SYSTEM_ARCH})
-ENDIF()
-
-
-## variables that apply to all packages
-SET(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${OPENSCENEGRAPH_VERSION}")
-
-# these goes for all platforms. Setting these stops the CPack.cmake script from generating options about other package compression formats (.z .tz, etc.)
-IF(WIN32)
-    SET(CPACK_GENERATOR "ZIP")
-ELSE()
-    SET(CPACK_GENERATOR "TGZ")
-ENDIF()
-SET(CPACK_SOURCE_GENERATOR "TGZ")
-
-
-# for ms visual studio we use it's internally defined variable to get the configuration (debug,release, ...) 
-IF(MSVC_IDE)
-    SET(OSG_CPACK_CONFIGURATION "$(OutDir)")
-    SET(PACKAGE_TARGET_PREFIX "Package ")
-ELSE()
-    # on un*x an empty CMAKE_BUILD_TYPE means release
-    IF(CMAKE_BUILD_TYPE)
-        SET(OSG_CPACK_CONFIGURATION ${CMAKE_BUILD_TYPE})
-    ELSE()
-        SET(OSG_CPACK_CONFIGURATION "Release")
-    ENDIF()
-    SET(PACKAGE_TARGET_PREFIX "package_")
-ENDIF()
-
-# Get all defined components
-GET_CMAKE_PROPERTY(CPACK_COMPONENTS_ALL COMPONENTS)
-IF(NOT CPACK_COMPONENTS_ALL)
-  # cmake 2.6.0 don't supply the COMPONENTS property.
-  # I set it manually to be the packages that can always be packaged
-  MESSAGE("When building packages please consider using cmake version 2.6.1 or above")
-  SET(CPACK_COMPONENTS_ALL libopenscenegraph libopenthreads openscenegraph libopenscenegraph-dev libopenthreads-dev)
-ENDIF()
-
-# Create a target that will be used to generate all packages defined below
-SET(PACKAGE_ALL_TARGETNAME "${PACKAGE_TARGET_PREFIX}ALL")
-ADD_CUSTOM_TARGET(${PACKAGE_ALL_TARGETNAME})
-
-MACRO(GENERATE_PACKAGING_TARGET package_name)
-    SET(CPACK_PACKAGE_NAME ${package_name})
-
-    # the doc packages don't need a system-arch specification
-    IF(${package} MATCHES -doc)
-        SET(OSG_PACKAGE_FILE_NAME ${package_name}-${OPENSCENEGRAPH_VERSION})
-    ELSE()
-        SET(OSG_PACKAGE_FILE_NAME ${package_name}-${OPENSCENEGRAPH_VERSION}-${OSG_CPACK_SYSTEM_SPEC_STRING}-${OSG_CPACK_CONFIGURATION})
-        IF(NOT DYNAMIC_OPENSCENEGRAPH)
-            SET(OSG_PACKAGE_FILE_NAME ${OSG_PACKAGE_FILE_NAME}-static)
-        ENDIF()
-    ENDIF()
-
-    CONFIGURE_FILE("${OpenSceneGraph_SOURCE_DIR}/CMakeModules/OsgCPackConfig.cmake.in" "${OpenSceneGraph_BINARY_DIR}/CPackConfig-${package_name}.cmake" IMMEDIATE)
-
-    SET(PACKAGE_TARGETNAME "${PACKAGE_TARGET_PREFIX}${package_name}")
-
-    # This is naive and will probably need fixing eventually
-    IF(MSVC)
-        SET(MOVE_COMMAND "move")
-    ELSE()
-        SET(MOVE_COMMAND "mv")
-    ENDIF()
-
-    # Set in and out archive filenames. Windows = zip, others = tar.gz
-    IF(WIN32)
-        SET(ARCHIVE_EXT "zip")
-    ELSE()
-        SET(ARCHIVE_EXT "tar.gz")
-    ENDIF()
-    
-    # Create a target that creates the current package
-    # and rename the package to give it proper filename
-    ADD_CUSTOM_TARGET(${PACKAGE_TARGETNAME})
-    ADD_CUSTOM_COMMAND(TARGET ${PACKAGE_TARGETNAME}
-        COMMAND ${CMAKE_CPACK_COMMAND} -C ${OSG_CPACK_CONFIGURATION} --config ${OpenSceneGraph_BINARY_DIR}/CPackConfig-${package_name}.cmake
-        COMMAND "${MOVE_COMMAND}" "${CPACK_PACKAGE_FILE_NAME}.${ARCHIVE_EXT}" "${OSG_PACKAGE_FILE_NAME}.${ARCHIVE_EXT}"
-        COMMAND ${CMAKE_COMMAND} -E echo "renamed ${CPACK_PACKAGE_FILE_NAME}.${ARCHIVE_EXT} -> ${OSG_PACKAGE_FILE_NAME}.${ARCHIVE_EXT}"
-        COMMENT "Run CPack packaging for ${package_name}..."
-    )
-    # Add the exact same custom command to the all package generating target. 
-    # I can't use add_dependencies to do this because it would allow parallell building of packages so am going brute here
-    ADD_CUSTOM_COMMAND(TARGET ${PACKAGE_ALL_TARGETNAME}
-        COMMAND ${CMAKE_CPACK_COMMAND} -C ${OSG_CPACK_CONFIGURATION} --config ${OpenSceneGraph_BINARY_DIR}/CPackConfig-${package_name}.cmake
-        COMMAND "${MOVE_COMMAND}" "${CPACK_PACKAGE_FILE_NAME}.${ARCHIVE_EXT}" "${OSG_PACKAGE_FILE_NAME}.${ARCHIVE_EXT}"
-        COMMAND ${CMAKE_COMMAND} -E echo "renamed ${CPACK_PACKAGE_FILE_NAME}.${ARCHIVE_EXT} -> ${OSG_PACKAGE_FILE_NAME}.${ARCHIVE_EXT}"
-    )
-ENDMACRO(GENERATE_PACKAGING_TARGET)
-
-# Create configs and targets for a package including all components
-SET(OSG_CPACK_COMPONENT ALL)
-GENERATE_PACKAGING_TARGET(openscenegraph-all)
-
-# Create configs and targets for each component
-FOREACH(package ${CPACK_COMPONENTS_ALL})
-    SET(OSG_CPACK_COMPONENT ${package})
-    GENERATE_PACKAGING_TARGET(${package})
-ENDFOREACH()

CMakeModules/OsgCPackConfig.cmake.in

@@ -1,71 +0,0 @@
-# This file will be configured to contain variables for CPack. These variables
-# should be set in the CMake list file of the project before CPack module is
-# included. Example variables are:
-#   CPACK_GENERATOR                     - Generator used to create package
-#   CPACK_INSTALL_CMAKE_PROJECTS        - For each project (path, name, component)
-#   CPACK_CMAKE_GENERATOR               - CMake Generator used for the projects
-#   CPACK_INSTALL_COMMANDS              - Extra commands to install components
-#   CPACK_INSTALL_DIRECTORIES           - Extra directories to install
-#   CPACK_PACKAGE_DESCRIPTION_FILE      - Description file for the package
-#   CPACK_PACKAGE_DESCRIPTION_SUMMARY   - Summary of the package
-#   CPACK_PACKAGE_EXECUTABLES           - List of pairs of executables and labels
-#   CPACK_PACKAGE_FILE_NAME             - Name of the package generated
-#   CPACK_PACKAGE_ICON                  - Icon used for the package
-#   CPACK_PACKAGE_INSTALL_DIRECTORY     - Name of directory for the installer
-#   CPACK_PACKAGE_NAME                  - Package project name
-#   CPACK_PACKAGE_VENDOR                - Package project vendor
-#   CPACK_PACKAGE_VERSION               - Package project version
-#   CPACK_PACKAGE_VERSION_MAJOR         - Package project version (major)
-#   CPACK_PACKAGE_VERSION_MINOR         - Package project version (minor)
-#   CPACK_PACKAGE_VERSION_PATCH         - Package project version (patch)
-
-# There are certain generator specific ones
-
-# NSIS Generator:
-#   CPACK_PACKAGE_INSTALL_REGISTRY_KEY  - Name of the registry key for the installer
-#   CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS - Extra commands used during uninstall
-#   CPACK_NSIS_EXTRA_INSTALL_COMMANDS   - Extra commands used during install
-
-
-SET(CPACK_BINARY_BUNDLE "${CPACK_BINARY_BUNDLE}")
-SET(CPACK_BINARY_CYGWIN "${CPACK_BINARY_CYGWIN}")
-SET(CPACK_BINARY_DEB "${CPACK_BINARY_DEB}")
-SET(CPACK_BINARY_NSIS "${CPACK_BINARY_NSIS}")
-SET(CPACK_BINARY_OSXX11 "${CPACK_BINARY_OSXX11}")
-SET(CPACK_BINARY_PACKAGEMAKER "${CPACK_BINARY_PACKAGEMAKER}")
-SET(CPACK_BINARY_RPM "${CPACK_BINARY_RPM}")
-SET(CPACK_BINARY_STGZ "${CPACK_BINARY_STGZ}")
-SET(CPACK_BINARY_TBZ2 "${CPACK_BINARY_TBZ2}")
-SET(CPACK_BINARY_TGZ "${CPACK_BINARY_TGZ}")
-SET(CPACK_BINARY_TZ "${CPACK_BINARY_TZ}")
-SET(CPACK_BINARY_ZIP "${CPACK_BINARY_ZIP}")
-SET(CPACK_CMAKE_GENERATOR "${CMAKE_GENERATOR}")
-SET(CPACK_COMPONENTS_ALL "${CPACK_COMPONENTS_ALL}")
-SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
-SET(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
-SET(CPACK_GENERATOR "${CPACK_GENERATOR}")
-SET(CPACK_INSTALL_CMAKE_PROJECTS "${OpenSceneGraph_BINARY_DIR};OpenSceneGraph;${OSG_CPACK_COMPONENT};/")
-SET(CPACK_INSTALL_PREFIX "${CPACK_INSTALL_PREFIX}")
-SET(CPACK_MODULE_PATH "${OpenSceneGraph_SOURCE_DIR}/CMakeModules;")
-SET(CPACK_NSIS_DISPLAY_NAME "${CMAKE_PROJECT_NAME} ${OPENSCENEGRAPH_VERSION}")
-SET(CPACK_NSIS_INSTALLER_ICON_CODE "")
-SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
-SET(CPACK_OUTPUT_CONFIG_FILE "${PROJECT_BINARY_DIR}/CPackConfig-${OSG_CPACK_COMPONENT}.cmake")
-SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${OpenSceneGraph_SOURCE_DIR}/README.txt")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The OpenSceneGraph is an open source high performance 3d graphics toolkit")
-SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}")
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
-SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CMAKE_PROJECT_NAME}-${OPENSCENEGRAPH_VERSION}")
-SET(CPACK_PACKAGE_NAME "${CPACK_PACKAGE_NAME}")
-SET(CPACK_PACKAGE_RELOCATABLE "true")
-SET(CPACK_PACKAGE_VENDOR "The OpenSceneGraph developers and contributors lead by Robert Osfield")
-SET(CPACK_PACKAGE_VERSION "${OPENSCENEGRAPH_VERSION}")
-SET(CPACK_PACKAGE_VERSION_MAJOR "${OPENSCENEGRAPH_MAJOR_VERSION}")
-SET(CPACK_PACKAGE_VERSION_MINOR "${OPENSCENEGRAPH_MINOR_VERSION}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${OPENSCENEGRAPH_PATCH_VERSION}")
-SET(CPACK_RESOURCE_FILE_LICENSE "${OpenSceneGraph_SOURCE_DIR}/LICENSE.txt")
-SET(CPACK_RESOURCE_FILE_README "${OpenSceneGraph_SOURCE_DIR}/README.txt")
-SET(CPACK_RESOURCE_FILE_WELCOME "${OpenSceneGraph_SOURCE_DIR}/NEWS.txt")
-SET(CPACK_SET_DESTDIR "OFF")
-SET(CPACK_STRIP_FILES "ON")

CMakeModules/OsgDetermineCompiler.cmake

@@ -1,81 +0,0 @@
-# - Figure out what compiler (and version) cmake is generating for
-# Once done this will define:
-#
-# Variable:
-#   OSG_COMPILER
-# 
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-
-    EXEC_PROGRAM(
-        ${CMAKE_CXX_COMPILER}  
-        ARGS     ${CMAKE_CXX_COMPILER_ARG1} -dumpversion 
-        OUTPUT_VARIABLE gcc_compiler_version
-    )
-    #MESSAGE("GCC Version: ${gcc_compiler_version}")
-
-ELSE(CMAKE_COMPILER_IS_GNUCXX)
-    IF(MSVC)
-        IF(MSVC60)
-            SET(OSG_COMPILER "vc60")
-        ENDIF(MSVC60)
-        IF(MSVC70)
-            SET(OSG_COMPILER "vc70")
-        ENDIF(MSVC70)
-        IF(MSVC71)
-            SET(OSG_COMPILER "vc71")
-        ENDIF(MSVC71)
-        IF(MSVC80)
-            SET(OSG_COMPILER "vc80")
-        ENDIF(MSVC80)
-        IF(MSVC90)
-            SET(OSG_COMPILER "vc90")
-        ENDIF(MSVC90)
-
-        IF(MSVC80)
-            MESSAGE(STATUS "Checking if compiler has service pack 1 installed...")
-            FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx" "int main() {return 0;}\n")
-
-            TRY_COMPILE(_TRY_RESULT
-              ${CMAKE_BINARY_DIR}
-              ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx
-              CMAKE_FLAGS -D CMAKE_VERBOSE_MAKEFILE=ON
-              OUTPUT_VARIABLE OUTPUT
-            )
-
-            IF(_TRY_RESULT)
-                # parse for exact compiler version
-                STRING(REGEX MATCH "Compiler Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" vc_compiler_version "${OUTPUT}")
-                IF(vc_compiler_version)
-                    #MESSAGE("${vc_compiler_version}")
-                    STRING(REGEX MATCHALL "[0-9]+" CL_VERSION_LIST "${vc_compiler_version}")
-                    LIST(GET CL_VERSION_LIST 0 CL_MAJOR_VERSION)
-                    LIST(GET CL_VERSION_LIST 1 CL_MINOR_VERSION)
-                    LIST(GET CL_VERSION_LIST 2 CL_PATCH_VERSION)
-                    LIST(GET CL_VERSION_LIST 3 CL_EXTRA_VERSION)
-                ENDIF(vc_compiler_version)
-
-                # Standard vc80 is 14.00.50727.42, sp1 14.00.50727.762, sp2?
-                # Standard vc90 is 9.0.30729.1, sp1 ?
-                IF(CL_EXTRA_VERSION EQUAL 762)
-                    SET(OSG_COMPILER "vc80sp1")
-                ELSE(CL_EXTRA_VERSION EQUAL 762)
-                    SET(OSG_COMPILER "vc80")
-                ENDIF(CL_EXTRA_VERSION EQUAL 762)
-
-                # parse for exact visual studio version
-                #IF(MSVC_IDE)
-                # string(REGEX MATCH "Visual Studio Version [0-9]+.[0-9]+.[0-9]+.[0-9]+" vs_version "${OUTPUT}")
-                # IF(vs_version)
-                    # MESSAGE("${vs_version}")
-                    # string(REGEX MATCHALL "[0-9]+" VS_VERSION_LIST "${vs_version}")
-                    # list(GET VS_VERSION_LIST 0 VS_MAJOR_VERSION)
-                    # list(GET VS_VERSION_LIST 1 VS_MINOR_VERSION)
-                    # list(GET VS_VERSION_LIST 2 VS_PATCH_VERSION)
-                    # list(GET VS_VERSION_LIST 3 VS_EXTRA_VERSION)
-                # ENDIF(vs_version)
-                #ENDIF(MSVC_IDE)
-            ENDIF(_TRY_RESULT)
-        ENDIF(MSVC80)
-    ENDIF(MSVC)
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)

CMakeModules/OsgMacroUtils.cmake

@@ -21,22 +21,19 @@ MACRO(LINK_WITH_VARIABLES TRGTNAME)
 ENDMACRO(LINK_WITH_VARIABLES TRGTNAME)
 
 MACRO(LINK_INTERNAL TRGTNAME)
-    IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
-        TARGET_LINK_LIBRARIES(${TRGTNAME} ${ARGN})
-    ELSE(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
-        FOREACH(LINKLIB ${ARGN})
-            IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
-                #when using versioned names, the .dll name differ from .lib name, there is a problem with that:
-                #CMake 2.4.7, at least seem to use PREFIX instead of IMPORT_PREFIX  for computing linkage info to use into projects,
-                # so we full path name to specify linkage, this prevent automatic inferencing of dependencies, so we add explicit depemdencies
-                #to library targets used
-                TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${OUTPUT_LIBDIR}/${LINKLIB}.lib" debug "${OUTPUT_LIBDIR}/${LINKLIB}${CMAKE_DEBUG_POSTFIX}.lib")
-                ADD_DEPENDENCIES(${TRGTNAME} ${LINKLIB})
-            ELSE(MSVC AND OSG_MSVC_VERSIONED_DLL)
-                TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${LINKLIB}" debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-            ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
-        ENDFOREACH(LINKLIB)
-    ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+    FOREACH(LINKLIB ${ARGN})
+    	IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
+    		#when using versioned names, the .dll name differ from .lib name, there is a problem with that:
+    		#CMake 2.4.7, at least seem to use PREFIX instead of IMPORT_PREFIX  for computing linkage info to use into projects,
+    		# so we full path name to specify linkage, this prevent automatic inferencing of dependencies, so we add explicit depemdencies
+    		#to library targets used
+
+        TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${OUTPUT_LIBDIR}/${LINKLIB}" debug "${OUTPUT_LIBDIR}/${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
+        ADD_DEPENDENCIES(${TRGTNAME} ${LINKLIB})
+      ELSE(MSVC AND OSG_MSVC_VERSIONED_DLL)
+        TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${LINKLIB}" debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
+    	ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
+    ENDFOREACH(LINKLIB)
 ENDMACRO(LINK_INTERNAL TRGTNAME)
 
 MACRO(LINK_EXTERNAL TRGTNAME)
@@ -98,7 +95,7 @@ MACRO(SETUP_LINK_LIBRARIES)
 #    FOREACH(LINKLIB ${TARGET_LIBRARIES})
 #            TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
 #    ENDFOREACH(LINKLIB)
-        LINK_INTERNAL(${TARGET_TARGETNAME} ${TARGET_LIBRARIES})
+		LINK_INTERNAL(${TARGET_TARGETNAME} ${TARGET_LIBRARIES})
     FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES})
             TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB})
     ENDFOREACH(LINKLIB)
@@ -106,8 +103,8 @@ MACRO(SETUP_LINK_LIBRARIES)
             LINK_WITH_VARIABLES(${TARGET_TARGETNAME} ${TARGET_LIBRARIES_VARS})
         ENDIF(TARGET_LIBRARIES_VARS)
     IF(MSVC  AND OSG_MSVC_VERSIONED_DLL)
-        #when using full path name to specify linkage, it seems that already linked libs must be specified
-            LINK_EXTERNAL(${TARGET_TARGETNAME} ${OPENGL_LIBRARIES}) 
+    	#when using full path name to specify linkage, it seems that already linked libs must be specified
+			LINK_EXTERNAL(${TARGET_TARGETNAME} ${OPENGL_LIBRARIES}) 
     ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
 
 ENDMACRO(SETUP_LINK_LIBRARIES)
@@ -118,7 +115,7 @@ ENDMACRO(SETUP_LINK_LIBRARIES)
 
 MACRO(SETUP_PLUGIN PLUGIN_NAME)
 
-    SET(TARGET_NAME ${PLUGIN_NAME} )
+        SET(TARGET_NAME ${PLUGIN_NAME} )
 
     #MESSAGE("in -->SETUP_PLUGIN<-- ${TARGET_NAME}-->${TARGET_SRC} <--> ${TARGET_H}<--")
 
@@ -130,15 +127,8 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
     IF(NOT TARGET_LABEL)
             SET(TARGET_LABEL "${TARGET_DEFAULT_LABEL_PREFIX} ${TARGET_NAME}")
     ENDIF(NOT TARGET_LABEL)
-
-    ## plugins gets put in libopenscenegraph by default
-    IF(${ARGC} GREATER 1)
-      SET(PACKAGE_COMPONENT libopenscenegraph-${ARGV1})
-    ELSE(${ARGC} GREATER 1)
-      SET(PACKAGE_COMPONENT libopenscenegraph)
-    ENDIF(${ARGC} GREATER 1)
     
-    # here we use the command to generate the library    
+# here we use the command to generate the library    
 
     IF   (DYNAMIC_OPENSCENEGRAPH)
         ADD_LIBRARY(${TARGET_TARGETNAME} MODULE ${TARGET_SRC} ${TARGET_H})
@@ -148,57 +138,36 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
     
     #not sure if needed, but for plugins only Msvc need the d suffix
     IF(NOT MSVC)
-        IF(NOT UNIX)
-            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "")
-        ENDIF(NOT UNIX)
+        SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "")
     ELSE(NOT MSVC)
-        IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
-            IF(NOT MSVC_IDE)
-                SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "${OSG_PLUGINS}/")                     
-            ELSE(NOT MSVC_IDE)
-                SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../${OSG_PLUGINS}/")
-            ENDIF(NOT MSVC_IDE)
-        ELSE(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
-            IF(OSG_MSVC_VERSIONED_DLL) 
-
-                #this is a hack... the build place is set to lib/<debug or release> by LIBARARY_OUTPUT_PATH equal to OUTPUT_LIBDIR
-                #the .lib will be crated in ../ so going straight in lib by the IMPORT_PREFIX property
-                #because we want dll placed in OUTPUT_BINDIR ie the bin folder sibling of lib, we can use ../../bin to go there,
-                #it is hardcoded, we should compute OUTPUT_BINDIR position relative to OUTPUT_LIBDIR ... to be implemented
-                #changing bin to something else breaks this hack
-                #the dll are placed in bin/${OSG_PLUGINS} 
-
-                IF(NOT MSVC_IDE)
-                    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../bin/${OSG_PLUGINS}/")                     
-                ELSE(NOT MSVC_IDE)
-                    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../../bin/${OSG_PLUGINS}/" IMPORT_PREFIX "../")
-                ENDIF(NOT MSVC_IDE)
-
-            ELSE(OSG_MSVC_VERSIONED_DLL)
-
-                #in standard mode (unversioned) the .lib and .dll are placed in lib/<debug or release>/${OSG_PLUGINS}.
-                #here the PREFIX property has been used, the same result would be accomplidhe by prepending ${OSG_PLUGINS}/ to OUTPUT_NAME target property
-
-                SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "${OSG_PLUGINS}/")
-            ENDIF(OSG_MSVC_VERSIONED_DLL)
-        ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
+    	IF(OSG_MSVC_VERSIONED_DLL) 
+    		   		
+				#this is a hack... the build place is set to lib/<debug or release> by LIBARARY_OUTPUT_PATH equal to OUTPUT_LIBDIR
+				#the .lib will be crated in ../ so going straight in lib by the IMPORT_PREFIX property
+				#because we want dll placed in OUTPUT_BINDIR ie the bin folder sibling of lib, we can use ../../bin to go there,
+				#it is hardcoded, we should compute OUTPUT_BINDIR position relative to OUTPUT_LIBDIR ... to be implemented
+				#changing bin to something else breaks this hack
+				#the dll are placed in bin/${OSG_PLUGINS} 
+				
+    		SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../../bin/${OSG_PLUGINS}/")
+	 			SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES IMPORT_PREFIX "../")
+    	ELSE(OSG_MSVC_VERSIONED_DLL)
+    		
+    		#in standard mode (unversioned) the .lib and .dll are placed in lib/<debug or release>/${OSG_PLUGINS}.
+    		#here the PREFIX property has been used, the same result would be accomplidhe by prepending ${OSG_PLUGINS}/ to OUTPUT_NAME target property
+    		
+    		SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "${OSG_PLUGINS}/")
+    	ENDIF(OSG_MSVC_VERSIONED_DLL)
     ENDIF(NOT MSVC)
-
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
  
     SETUP_LINK_LIBRARIES()
 
 #the installation path are differentiated for win32 that install in bib versus other architecture that install in lib${LIB_POSTFIX}/${OSG_PLUGINS}
     IF(WIN32)
-        INSTALL(TARGETS ${TARGET_TARGETNAME} 
-            RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT}
-            ARCHIVE DESTINATION lib/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev
-            LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT})
+        INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib/${OSG_PLUGINS} LIBRARY DESTINATION bin/${OSG_PLUGINS} )
     ELSE(WIN32)
-        INSTALL(TARGETS ${TARGET_TARGETNAME}
-            RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT}
-            ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev
-            LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT})
+        INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} )
     ENDIF(WIN32)
 ENDMACRO(SETUP_PLUGIN)
 
@@ -251,15 +220,12 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
         ADD_EXECUTABLE(${TARGET_TARGETNAME} ${PLATFORM_SPECIFIC_CONTROL} ${TARGET_SRC} ${TARGET_H})
         
     ENDIF(${IS_COMMANDLINE_APP})
-
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
-    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
+    SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
-
-    IF(MSVC_IDE AND OSG_MSVC_VERSIONED_DLL)
-            SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../")    
-    ENDIF(MSVC_IDE AND OSG_MSVC_VERSIONED_DLL)
-
+    IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
+    		SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PREFIX "../")    
+		ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
     SETUP_LINK_LIBRARIES()    
 
 ENDMACRO(SETUP_EXE)
@@ -277,11 +243,7 @@ MACRO(SETUP_APPLICATION APPLICATION_NAME)
             
         SETUP_EXE(${IS_COMMANDLINE_APP})
         
-        IF(APPLE)
-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin BUNDLE DESTINATION bin)
-        ELSE(APPLE)
-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph  )
-        ENDIF(APPLE)
+    INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin  )
 
 ENDMACRO(SETUP_APPLICATION)
 
@@ -304,11 +266,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
             
         SETUP_EXE(${IS_COMMANDLINE_APP})
         
-        IF(APPLE)
-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin BUNDLE DESTINATION share/OpenSceneGraph/bin )            
-        ELSE(APPLE)
-            INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
-        ENDIF(APPLE)
+    INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin  )            
 
 ENDMACRO(SETUP_EXAMPLE)
 
@@ -321,12 +279,12 @@ ENDMACRO(SETUP_COMMANDLINE_EXAMPLE)
 
 # Takes two optional arguments -- osg prefix and osg version
 MACRO(HANDLE_MSVC_DLL)
-        #this is a hack... the build place is set to lib/<debug or release> by LIBARARY_OUTPUT_PATH equal to OUTPUT_LIBDIR
-        #the .lib will be crated in ../ so going straight in lib by the IMPORT_PREFIX property
-        #because we want dll placed in OUTPUT_BINDIR ie the bin folder sibling of lib, we can use ../../bin to go there,
-        #it is hardcoded, we should compute OUTPUT_BINDIR position relative to OUTPUT_LIBDIR ... to be implemented
-        #changing bin to something else breaks this hack
-        #the dll are versioned by prefixing the name with osg${OPENSCENEGRAPH_SOVERSION}-
+	#this is a hack... the build place is set to lib/<debug or release> by LIBARARY_OUTPUT_PATH equal to OUTPUT_LIBDIR
+	#the .lib will be crated in ../ so going straight in lib by the IMPORT_PREFIX property
+	#because we want dll placed in OUTPUT_BINDIR ie the bin folder sibling of lib, we can use ../../bin to go there,
+	#it is hardcoded, we should compute OUTPUT_BINDIR position relative to OUTPUT_LIBDIR ... to be implemented
+	#changing bin to something else breaks this hack
+	#the dll are versioned by prefixing the name with osg${OPENSCENEGRAPH_SOVERSION}-
 
         # LIB_PREFIX: use "osg" by default, else whatever we've been given.
         IF(${ARGC} GREATER 0)
@@ -341,24 +299,10 @@ MACRO(HANDLE_MSVC_DLL)
         ELSE(${ARGC} GREATER 1)
                 SET(LIB_SOVERSION ${OPENSCENEGRAPH_SOVERSION})
         ENDIF(${ARGC} GREATER 1)
-    
-        IF(NOT MSVC_IDE) 
-            SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../bin/${LIB_PREFIX}${LIB_SOVERSION}-")
-            IF (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) 
-                SET(NEW_LIB_NAME "${OUTPUT_BINDIR}/${LIB_PREFIX}${LIB_SOVERSION}-${LIB_NAME}")
-                ADD_CUSTOM_COMMAND(
-                    TARGET ${LIB_NAME}
-                    POST_BUILD
-                    COMMAND ${CMAKE_COMMAND} -E copy "${NEW_LIB_NAME}.lib"  "${OUTPUT_LIBDIR}/${LIB_NAME}.lib"
-                    COMMAND ${CMAKE_COMMAND} -E copy "${NEW_LIB_NAME}.exp"  "${OUTPUT_LIBDIR}/${LIB_NAME}.exp"
-                    COMMAND ${CMAKE_COMMAND} -E remove "${NEW_LIB_NAME}.lib"
-                    COMMAND ${CMAKE_COMMAND} -E remove "${NEW_LIB_NAME}.exp"
-                    )
-            ENDIF (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) 
-        ELSE(NOT MSVC_IDE) 
-            SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/${LIB_PREFIX}${LIB_SOVERSION}-" IMPORT_PREFIX "../")
-        ENDIF(NOT MSVC_IDE) 
+	
+        SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/${LIB_PREFIX}${LIB_SOVERSION}-")
+        SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "../")
 
-#     SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/osg${OPENSCENEGRAPH_SOVERSION}-")
-#     SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "../")
+#	 SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES PREFIX "../../bin/osg${OPENSCENEGRAPH_SOVERSION}-")
+#	 SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES IMPORT_PREFIX "../")
 ENDMACRO(HANDLE_MSVC_DLL)

CMakeModules/clean_directories

@@ -1,6 +0,0 @@
-find . -name Makefile | xargs rm -rf 
-find . -name cmake_install.cmake  | xargs rm -rf 
-find . -name CMakeFiles | xargs rm -rf 
-rm -rf CMakeCache.txt cmake_uninstall.cmake install_manifest.txt
-rm -rf lib bin
-

CTestConfig.cmake

@@ -1,13 +0,0 @@
-## This file should be placed in the root directory of your project.
-## Then modify the CMakeLists.txt file in the root directory of your
-## project to incorporate the testing dashboard.
-## # The following are required to uses Dart and the Cdash dashboard
-##   ENABLE_TESTING()
-##   INCLUDE(Dart)
-set(CTEST_PROJECT_NAME "OpenSceneGraph")
-set(CTEST_NIGHTLY_START_TIME "00:00:00 CET")
-
-set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "www.cdash.org")
-set(CTEST_DROP_LOCATION "/CDashPublic/submit.php?project=OpenSceneGraph")
-set(CTEST_DROP_SITE_CDASH TRUE)

LICENSE.txt

@@ -13,9 +13,8 @@
   under the terms of the OpenSceneGraph Public License (OSGPL) version 0.0
   or later.
   
-  Notes: the OSGPL is based on the LGPL, with the 4 exceptions laid
-  out in the wxWindows section below.  The LGPL is contained in the
-  final section of this license.
+  Notes: the OSGPL is based on the LGPL, with the 4 exceptions laid in the wxWindows 
+  section below.  The LGPL in the final section of this license.
 
 
 -------------------------------------------------------------------------------
@@ -188,7 +187,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-          GNU LESSER GENERAL PUBLIC LICENSE
+		  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other

NEWS.txt

@@ -1,222 +1,6 @@
 OSG News
 ========
 
-= !OpenSceneGraph 2.8.1 release - bug fix release =
-
-PERTHSHIRE, Scotland - 19th May 2009 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.8.1, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.8 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.8 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
-
-=== Open-source development delivers industry-leading features and performance ===
-The !OpenSceneGraph 2.8.1 release is the culmination of 10 years of work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs. 
-
-=== Updates between 2.8.1 and 2.8.0 releases include: ===
-
-  * Build fixes under FreeBSD and IBM AIX, and RedHat Enterprise Linux.
-  * Improved compatibility with SWIG wrapper building
-  * Crash fixes in osg::State, osg::Geometry and osgWidget.
-  * Bug fixes to :
-    * draw instanced support
-    * Optimizer - MergeGeometryVisitor, RemoveLoadedProxyNodesVisitor and SpatializeGroupsVistor
-    * hdr image loader
-    * handling of opacity maps in 3ds loader
-    * dxf loader
-    * frame buffer object
-    * cursor/event handling in windows
-    * windows threading
-    * memory leak in Collada loader
-    * fixes to display lists/vbo creation that prevent crash under ATI drivers
-    * subface PolygonOffset setting in OpenFlight
-    * osgconv --formats under OSX
-    * osgTerrain::Layer bounding volume calculation.
-
-=== Updates between 2.8 and 2.6 include: ===
-
-  * New osgVolume library for volume rendering, with support for:
-    * High quality GPU based Ray tracing
-    * Transfer functions
-    * Per pixel lighting
-    * Iso surface rendering
-    * Maximum Intensity Projection rendering
-    * Non-power-of-two 3D textures, and 3D texture compression
-    * DICOM loading for reading dicom medical data
-  * New osgAnimation library for character and scene animation.
-  * New plugin for reading Biovision hierarchical files (.BVH) to generate character motion animations.
-  * New osgShadow support for Light Space Perspective Shadow Maps (LispSM).
-  * Three new scene graph widgets for placing traditional 2D capability into fully interactive 3D scenes:
-    * PDF widget (based on libPoppler)
-    * VNC client widget (based on libVNCServer) 
-    * Internet browser client widget (based on Gecko/UBrowser)
-  * New plugins for loading Half-Life 2 maps and models.
-  * New plugin for loading EXR, high dynamic range imagery
-  * Improvements to !DatabasePager, tailored for low latency paging.
-  * Improved runtime stats collection and on screen reporting.
-  * Performance improvements through optimization of matrix operations.
-  * Support for the OpenGL "draw instanced" extension.
-  * Support for zlib compressed native .ive and .gz files
-  * Improvements to COLLADA support.
-  * Build reporting using CDash
-  * New packaging support using CPack
-  * A wide range of build and bug fixes 
-
-=== Downloads and Licensing ===
-!OpenSceneGraph is open-source, so full source code is provided, and can be copied, modified and used free of charge for commercial and non-commercial use. Access to the source allows end users greater flexibility in how they develop, debug and deploy their applications.  They gain productivity and freedom by being able to leverage the tool chain in accordance with their own release cycles. Downloads of binaries and source can be found in the [http://www.openscenegraph.org/projects/osg/wiki/Downloads Downloads] section of the openscenegraph.org website.
-
-!OpenSceneGraph is released under the [http://www.openscenegraph.org/projects/osg/wiki/Legal OpenSceneGraph Public License], which is based on the Lesser GNU Public License (LGPL), permitting the software to be used free of charge across the full spectrum of commercial and open-source applications.  Furthermore, it allows both static and dynamic linking of the !OpenSceneGraph libraries without restricting the licensing of the user's software. 
-
-=== !OpenSceneGraph Books now available ===
-
-The !OpenSceneGraph Quick Start Guide is now available in Chinese as well as English, and alongside the Reference Manual, books can be found at [http://www.osgbooks.com OsgBooks].
-
-=== Professional support and services ===
-!OpenSceneGraph project is backed up with professional services by [http://www.openscenegraph.com OpenSceneGraph Professional Services], based in Scotland, and [http://www.skew-matrix.com Skew-Matrix] and [http://www.blue-newt.com Blue-Newt Software] both based in the USA, and a range of [wiki:Community/Contractors Contractors] from around the world.  Services available include:
-
- * Confidential Professional Support
- * Bespoke development
- * Consultancy 
- * Training    
-
-=== Community support and contributions ===
-The diverse and growing community of over 2000 developers is centred around the public osg-users mailing list, where members discuss how best to use !OpenSceneGraph, provide mutual support, and coordinate development of new features and bug fixes. Members of this community come from many different countries with backgrounds ranging from some of the world's largest aerospace companies, game companies, and visual simulation specialists to university researchers, students and hobbyists. 
-
-The !OpenSceneGraph project owes a great deal to the community for its development and support, in particular we wish to thank the [http://www.openscenegraph.org/projects/osg/wiki/Support/Contributors/TwoPointEight 365 individuals] from around the world that have directly contributed to the development and refinement of the !OpenSceneGraph code base. 
-
-----
-
-About !OpenSceneGraph: [[BR]]
-The !OpenSceneGraph Project was founded in September 1999 by Don Burns and Robert Osfield.
-Further information, screenshots, downloads, documentation, and support links can be found on the !OpenSceneGraph project website http://www.openscenegraph.org.
-
-About !OpenSceneGraph Professional Services:[[BR]]
-!OpenSceneGraph Professional Services, founded by project lead Robert Osfield in April 2001, is based in Callander, Perhshire, Scotland, and provides professional services on top of !OpenSceneGraph. Further information about the services it provides can be found at http://www.openscenegraph.com.
-
-----------------------------------------------------------------------------------------
-
-
-
-= !OpenSceneGraph 2.6 release adds osgWidget library, KdTree intersections, Anti-aliased FBOsand much more. =
-
-PERTHSHIRE, Scotland - 5th August 2008 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.6, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.6 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.6 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
-
-=== Open-source development delivers industry-leading features and performance ===
-The !OpenSceneGraph 2.6 release is the culmination of 9 years of work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs. 
-
-=== Updates include: ===
-
-    * New osgWidget library for scene graph based graphics user interface elements (beta release).
-    * KdTree support, with automatic KdTree generation on load and use of KdTree during line intersections which massively improves intersection speeds.
-    * Precision improvements to line intersections, provide accurate whole earth intersection.
-    * OpenGL Multi-sample FrameBufferObject support.
-    * New osg::ImageSequence class for doing texture animation of a series of image files.
-    * New database optimizer that is able to remove static transforms by duplicating shared geometries.
-    * Use glGenerateMipmap to speed up mipmap generation in non power-of-two textures.
-    * New osgViewer::ScreenCaptureHandler for adding screen shot support to osgViewer applications.
-    * New osgscreencapture example that demonstrates use of double buffer PixelBufferObject's for streaming of imagery from the screen.
-    * New utility application osgfilecache which can be used to populate the local cache for given lat/lon ranges and levels.
-    * Rewritten DatabasePager that now supports multiple database reading threads. This includes handling of HTTP requests via a separate reading thread, vastly improving the speed of updates when handling HTTP hosted databases that have already partially been downloaded to local file cache.
-    * Support for a file cache for locally caching paged databases hosted over HTTP.
-    * Support for http authentication in osgDB and the libcurl plugin
-    * New osgconv --format <fmt>, --formats and --plugins command line options for listing available plugins and the file formats/options they support.
-    * Performance improvements in handling TerraPage.
-    * Animated GIF support.
-    * New SVG image loader.
-    * Improvements to the .obj loader to support a wider range of .obj files and material properties.
-    * Support for thread safe Atomic reference counting.
-    * Support for COLLADA DOM 2.x
-    * Support for Philips WOWvx 3D auto-stereoscopic displays
-    * New include/osg/Config and include/OpenThreads/Config configuration files, that are automatically generated by CMake, which make more straight forward to build end users applications against OpenSceneGraph versions built with non default build options.
-    * Support for CMake 2.6
-    * A wide range of build and bug fixes 
-
- 
-=== Downloads and Licensing ===
-!OpenSceneGraph is open-source so full source code is provided, and can be copied, modified and used free of charge for commercial and non-commercial use. Access to the source allows end users greater flexibility in how they develop, debug and deploy their applications.  They gain productivity and freedom by being able to leverage the tool chain in accordance with their own release cycles. Downloads of binaries and source can be found in the [http://www.openscenegraph.org/projects/osg/wiki/Downloads Downloads] section of the openscenegraph.org website.
-
-!OpenSceneGraph is released under the [http://www.openscenegraph.org/projects/osg/wiki/Legal OpenSceneGraph Public License], which is based on the Lesser GNU Public License (LGPL), permitting the software to be used free of charge across the full spectrum of commercial and open-source applications.  Furthermore, it allows both static and dynamic linking of the !OpenSceneGraph libraries without restricting the licensing of the user's software. 
-
-=== !OpenSceneGraph Books now available ===
-
-The !OpenSceneGraph Quick Start Guide is now available in Chinese as well as English, and alongside the Reference Manual books can be found at [http://www.osgbooks.com OsgBooks].
-
-=== Professional support and services ===
-!OpenSceneGraph project is backed up with professional services by [http://openscenegraph.com OpenSceneGraph Professional Services], based in Scotland, and [http://www.skew-matrix.com Skew-Matrix] and [http://www.blue-newt.com Blue-Newt Software] both based in the USA, and a range of [wiki:Community/Contractors Contractors] from around the world.  Services available include:
-
- * Confidential Professional Support
- * Bespoke development
- * Consultancy 
- * Training    
-
-=== Community support and contributions ===
-The diverse and growing community of over 1900 developers is centred around the public osg-users mailing list, where members discuss how best to use !OpenSceneGraph, provide mutual support, and coordinate development of new features and bug fixes. Members of this community come from many different countries with backgrounds ranging from some of the world's largest aerospace companies, game companies, and visual simulation specialists to university researchers, students and hobbyists. 
-
-The !OpenSceneGraph project owes a great deal to the community for its development and support, in particular we wish to thank the [http://www.openscenegraph.org/projects/osg/wiki/Support/Contributors/TwoPointSix 324 individuals] from around the world that have directly contributed to the development and refinement of the !OpenSceneGraph code base. 
-
-----
-
-About !OpenSceneGraph:[[BR]]
-!OpenSceneGraph Project was founded in September 1999 by Don Burns and Robert Osfield.
-Further information, screenshots, downloads, documentation, and support links can be found on the !OpenSceneGraph project website http://www.openscenegraph.org.
-
-About !OpenSceneGraph Professional Services:[[BR]]
-!OpenSceneGraph Professional Services, founded by project lead Robert Osfield in April 2001, is based in Callander, Perhshire, Scotland, and provides professional services on top of !OpenSceneGraph. Further information about the services it provides can be found at http://www.openscenegraph.com.
-
-----------------------------------------------------------------------------------------
-
-
-= !OpenSceneGraph 2.4 release adds geometry shaders, multiple render targets, support for terrabyte scale terrain databases, writing to !OpenFlight and much more. =
-
-PERTHSHIRE, Scotland - 25th April 2008 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.4, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.4 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.4 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems.
-
-=== Open-source development delivers industry-leading features and performance ===
-The !OpenSceneGraph 2.4 release is the culmination of 9 years of work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs. 
-
-=== Updates include: ===
-
- * Support for OpenGL Geometry shaders
- * Support for OpenGL Multiple Render Targets extension to Frame Buffer Objects
- * Support for OpenGL Occlussion Query extension
- * New !OpenFlight writer
- * New libcurl based plugin for reading http hosted databases
- * Quicktime based reading of live video streams under Windows and OSX
- * Better load balancing in database pager
- * Improvements to osgTerrain for support of terrabyte scale whole earth terrain databases
- * Additions to the Shapefile loader with .dbf attribute file, .proj projection file support and loading data as doubles
- * Enhanced intersection functionality including double support for line intersections
- * Parallel build support under Visual Studio
- * Support for reading Producer .cfg viewer configuration files
- * A wide range of build and bug fixes
-  
-=== Downloads and Licensing ===
-!OpenSceneGraph is open-source so full source code is provided, and can be copied, modified and used free of charge for commercial and non-commercial use. Access to the source allows end users greater flexibility in how they develop, debug and deploy their applications.  They gain productivity and freedom by being able to leverage the tool chain in accordance with their own release cycles. Downloads of binaries and source can be found in the [http://www.openscenegraph.org/projects/osg/wiki/Downloads Downloads] section of the openscenegraph.org website.
-
-!OpenSceneGraph is released under the [http://www.openscenegraph.org/projects/osg/wiki/Legal OpenSceneGraph Public License], which is based on the Lesser GNU Public License (LGPL), permitting the software to be used free of charge across the full spectrum of commercial and open-source applications.  Furthermore, it allows both static and dynamic linking of the !OpenSceneGraph libraries without restricting the licensing of the user's software. 
-
-=== !OpenSceneGraph Books now available ===
-
-The !OpenSceneGraph Quick Start Guide is now available in Chinese as well as English, and alongside the Reference Manual books can be found at [http://www.osgbooks.com OsgBooks].
-
-=== Professional support and services ===
-!OpenSceneGraph project is backed up with professional services by [http://openscenegraph.com OpenSceneGraph Professional Services], based in Scotland, and [http://www.skew-matrix.com Skew-Matrix] and [http://www.blue-newt.com Blue-Newt Software] both based in the USA, and a range of [wiki:Community/Contractors Contractors] from around the world.  Services available include:
-
- * Confidential Professional Support
- * Bespoke development
- * Consultancy 
- * Training    
-
-=== Community support and contributions ===
-The diverse and growing community of over 1800 developers is centred around the public osg-users mailing list, where members discuss how best to use !OpenSceneGraph, provide mutual support, and coordinate development of new features and bug fixes. Members of this community come from many different countries with backgrounds ranging from some of the world's largest aerospace companies, game companies, and visual simulation specialists to university researchers, students and hobbyists. 
-
-The !OpenSceneGraph project owes a great deal to the community for its development and support, in particular we wish to thank the [http://www.openscenegraph.org/projects/osg/wiki/Support/Contributors/TwoPointFour 306 individuals] from around the world that have directly contributed to the development and refinement of the !OpenSceneGraph code base. 
-
-----
-
-About !OpenSceneGraph:[[BR]]
-!OpenSceneGraph Project was founded in September 1999 by Don Burns and Robert Osfield.
-Further information, screenshots, downloads, documentation, and support links can be found on the !OpenSceneGraph project website http://www.openscenegraph.org.
-
-About !OpenSceneGraph Professional Services:[[BR]]
-!OpenSceneGraph Professional Services, founded by project lead Robert Osfield in April 2001, is based in Callander, Perhshire, Scotland, and provides professional services on top of !OpenSceneGraph. Further information about the services it provides can be found at http://www.openscenegraph.com.
-
-----------------------------------------------------------------------------------------
-
 = OpenSceneGraph 2.2 release adds support for advanced displays, soft and parallel split shadow maps and easier builds =
 
 PERTHSHIRE, Scotland - 4th October 2007  - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.2, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.2 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.2 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and !FreeBSD operating systems.

PlatformSpecifics/Windows/VisualStudio_Syntax_Highlighting.txt

@@ -1,21 +0,0 @@
-Mapping extensionless header files to C++ in Visual Studio
-=============================================================================
-
-Previous versions of the OSG included registry files which enabled syntax 
-highlighting for OSG's extensionless headers in Visual Studio. These are not 
-needed anymore, because starting with Visual Studio 2002 (7.0), there is a 
-setting that will map extensionless files to a certain language in the 
-options. This also works for the Express Editions.
-
-1. Go to Tools-Options.
-2. Open the Text Editor section, and click on File Extension.
-3. At the bottom of the window, check the Map Extensionless Files To 
-   checkbox, and select Microsoft Visual C++ in the list to the right.
-
-Note that if you use this feature for other languages, you will have to 
-change it when needed. If that is too cumbersome you may want to generate 
-the registry files and do it that way instead. Please see the 
-.reg files in previous versions of OSG in the VisualStudio directory for 
-a guide on how to do that (hint: check the location of the registry key
-to make sure the added values end up in the right place for your version
-of Visual Studio).

README.txt

@@ -6,15 +6,11 @@ OpenSceneGraph website:
 
     http://www.openscenegraph.org
   
-For the impatient, read the simplified build notes below. For support 
-subscribe to our public mailing list:
-
-    http://www.openscenegraph.org/projects/osg/wiki/MailingLists
-
+For the impatient, read the simplified build notes below.
 
 Robert Osfield.
 Project Lead.
-19th May 2009.
+3rd October 2007.
 
 --
 
@@ -65,82 +61,9 @@ system should help guide you through the process:
 
 Under OSX you can either use the CMake build system above, or use the 
 Xcode projects that you will find in the OpenSceneGraph/Xcode 
-directory. See release notes on OSX CMake build below.
+directory.
 
 For further details on compilation, installation and platform-specific 
 information read "Getting Started" guide:
 
     http://www.openscenegraph.org/projects/osg/wiki/Support/GettingStarted
-   
-   
--- Release notes on OSX build, by Eric Sokolowsky, August 5, 2008
-
-There are several ways to compile OpenSceneGraph under OSX.  The
-recommended way is to use CMake 2.6 to generate Xcode projects, then use
-Xcode to build the library. The default project will be able to build
-Debug or Release libraries, examples, and sample applications. Here are
-some key settings to consider when using CMake:
-
-BUILD_OSG_EXAMPLES - By default this is turned off. Turn this setting on
-to compile many great example programs.
-
-CMAKE_OSX_ARCHITECTURES - Xcode can create applications, executables,
-libraries, and frameworks that can be run on more than one architecture.
-Use this setting to indicate the architectures on which to build OSG.
-Possibilities include ppc, ppc64, i386, and x86_64. Building OSG using
-either of the 64-bit options (ppc64 and x86_64) has its own caveats
-below.
-
-OSG_BUILD_APPLICATION_BUNDLES - Normally only executable binaries are
-created for the examples and sample applications. Turn this option on if
-you want to create real OSX .app bundles. There are caveats to creating
-.app bundles, see below.
-
-OSG_WINDOWING_SYSTEM - You have the choice to use Carbon or X11 when
-building applications on OSX. Under Leopard and later, X11 applications,
-when started, will automatically launch X11 when needed. However,
-full-screen X11 applications will still show the menu bar at the top of
-the screen. Since many parts of the Carbon user interface are not
-64-bit, X11 is the only supported option for OSX applications compiled
-for ppc64 or x86_64.
-
-There is an Xcode directory in the base of the OSG software
-distribution, but its future is limited, and will be discontinued once
-the CMake project generator completely implements its functionality.
-
-
-APPLICATION BUNDLES (.app bundles)
-
-The example programs when built as application bundles only contain the
-executable file. They do not contain the dependent libraries as would a
-normal bundle, so they are not generally portable to other machines.
-They also do not know where to find plugins. An environmental variable
-OSG_LIBRARY_PATH may be set to point to the location where the plugin
-.so files are located. OSG_FILE_PATH may be set to point to the location
-where data files are located. Setting OSG_FILE_PATH to the
-OpenSceneGraph-Data directory is very useful when testing OSG by running
-the example programs.
-
-Many of the example programs use command-line arguments. When
-double-clicking on an application (or using the equivalent "open"
-command on the command line) only those examples and applications that
-do not require command-line arguments will successfully run. The
-executable file within the .app bundle can be run from the command-line
-if command-line arguments are needed.
-
-
-64-BIT APPLICATION SUPPORT
-
-OpenSceneGraph will not compile successfully when OSG_WINDOWING_SYSTEM is
-Carbon and either x86_64 or ppc64 is selected under CMAKE_OSX_ARCHITECTURES,
-as Carbon is a 32bit only API. A version of the osgviewer library written in
-Cocoa is needed. However, OSG may be compiled under 64-bits if the X11
-windowing system is selected. However, Two parts of the OSG default
-distribution will not work with 64-bit X11: the osgviewerWX example
-program and the osgdb_qt (Quicktime) plugin. These must be removed from
-the Xcode project after Cmake generates it in order to compile with
-64-bit architectures. The lack of the latter means that images such as
-jpeg, tiff, png, and gif will not work, nor will animations dependent on
-Quicktime. A new ImageIO-based plugin is being developed to handle the
-still images, and a QTKit plugin will need to be developed to handle
-animations.

VisualStudio/LANGEXT.DAT

@@ -0,0 +1,201 @@
+langext.dat - Map explicit filename to a language
+[C/C++]
+algorithm bitset cassert cctype cerrno cfloat ciso646 climits clocale cmath complex
+csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime cwchar cwctype
+deque exception fstream functional iomanip ios iosfwd iostream istream iterator
+limits list locale map memory new numeric ostream queue
+set sstream stack stdexcept streambuf string strstream typeinfo utility valarray vector
+xcomplex xios xiosbase xlocale xlocinfo xlocmon xlocnum xloctime xmemory xstddef xstring xtree xutility
+AccelOperator
+AlphaFunc
+AnimationPath
+AnimationPathManipulator
+ApplicationUsage
+ArgumentParser
+Array
+Billboard
+BlendFunc
+BlinkSequence
+BoundingBox
+BoundingSphere
+BoundsChecking
+buffered_value
+Camera
+CameraManipulator
+CenteredPlacer
+ClearNode
+ClipNode
+ClipPlane
+CollectOccludersVisitor
+ColorMask
+ColorMatrix
+ConvexPlanarOccluder
+ConvexPlanarPolygon
+CopyOp
+Counter
+CubeMapGenerator
+CullFace
+CullingSet
+CullStack
+CullVisitor
+DelaunayTriangulator
+Depth
+DisplayListVisitor
+DisplayRequirementsVisitor
+DisplaySettings
+DOFTransform
+DotOsgWrapper
+Drawable
+DrawPixels
+DriveManipulator
+DynamicLibrary
+Emitter
+Endian
+EventAdapter
+Export
+fast_back_stack
+Field
+FieldReader
+FieldReaderIterator
+FileNameUtils
+FileUtils
+FlightManipulator
+FluidFrictionOperator
+Fog
+Font
+ForceOperator
+FrameStamp
+FrontFace
+Geode
+Geometry
+GeoSet
+GL
+GLExtensions
+GLU
+Group
+GUIActionAdapter
+GUIEventAdapter
+GUIEventHandler
+GUIEventHandlerVisitor
+HalfWayMapGenerator
+HighlightMapGenerator
+Image
+Impostor
+ImpostorSprite
+Input
+InsertImpostorsVisitor
+Interpolator
+IntersectVisitor
+KeyboardMouseCallback
+KeySwitchCameraManipulator
+Light
+LightModel
+LightPoint
+LightPointNode
+LightSource
+LinearInterpolator
+LineSegment
+LineStipple
+LineWidth
+LOD
+Material
+Math
+Matrix
+MatrixTransform
+ModularEmitter
+ModularProgram
+MultiSegmentPlacer
+Node
+NodeCallback
+NodeVisitor
+Notify
+Object
+OccluderNode
+Operator
+Optimizer
+OsgCameraGroup
+OsgSceneHandler
+Output
+ParameterOutput
+Particle
+ParticleProcessor
+ParticleSystem
+ParticleSystemUpdater
+PickVisitor
+Placer
+Plane
+Point
+PointPlacer
+PolygonMode
+PolygonOffset
+PolygonStipple
+Polytope
+PositionAttitudeTransform
+PrimitiveSet
+Program
+Projection
+Quat
+RadialShooter
+RandomRateCounter
+range
+ReaderWriter
+ReadFile
+ref_ptr
+Referenced
+ReflectionMapGenerator
+Registry
+RenderBin
+StateGraph
+RenderLeaf
+RenderStage
+PositionalStateContianer
+SceneView
+Sector
+SectorPlacer
+SegmentPlacer
+Sequence
+SetSceneViewVisitor
+ShadeModel
+ShadowVolumeOccluder
+Shape
+ShapeDrawable
+Shooter
+SmoothingVisitor
+State
+StateAttribute
+StateSet
+StateSetManipulator
+Statistics
+Stencil
+String
+Switch
+Tessellator
+TexEnv
+TexEnvCombine
+TexGen
+TexMat
+Text
+Texture
+Texture1D
+Texture2D
+Texture3D
+TextureCubeMap
+TextureRectangle
+Timer
+TrackballManipulator
+Transform
+TransformCallback
+TriangleFunctor
+TriStripVisitor
+UnitTestFramework
+UpdateVisitor
+VariableRateCounter
+Vec2
+Vec3
+Vec4
+Version
+VertexProgram
+Viewer
+ViewerEventHandler
+Viewport
+WriteFile

VisualStudio/MUST_READ_ME.txt

@@ -0,0 +1,93 @@
+Detailed build documentation can be found on the OpenSceneGraph website at:
+
+  http://openscenegraph.org/osgwiki/pmwiki.php/PlatformSpecifics/VisualStudio
+
+IMPORTANT NOTE: Whilst the OSG will compile cleanly with the basic VC++6.0
+and its own STL implementation, the OSG will crash regularily due to bugs
+in VC++6.0's STL. VC++6.0's STL is horribly broken and therefore is *NOT*
+supported. Do not attempt to use the OSG in conjunction with native VC++6.0
+STL implemention.
+
+The supported combinations are:
+
+    1.Visual Studio8.x .NET
+    2.Visual Studio7.x .NET
+
+Deprecated are:
+
+    3.Visual Studio6.0 + Dinkumware's STL bug fix patches
+    4.Visual Studio6.0 + STLport
+
+For details on how to patch VisualStudio6.0 see the above website link.
+Note, osgIntrospection, src/osgWrapper plugins and the
+osgintrospection example cannot be compiled under VisualStudio plugin.
+You will also need to run the fixup-vc6-dsps.pl script to clean up the
+project files that won't otherwise compile to do new elements required
+for support of Window 64 bit build under VS 7.x and 8.x.
+
+Several of the plugins and examples require external dependancies.  Full details on where to obtain
+these can be found in doc/dependancies.html.
+
+
+--
+
+For syntax highlighting in VisualStudio which the standard C++ style headers
+found in the OSG :
+
+VisualStudio6.0
+
+    Substiture the LANDEXT.DAT file found in this directory with the one found
+    *\Common\MSDev98\Bin
+
+VisualStudio7.x & 8.x/.NET
+
+    Install the syntaxhighlight.reg (just double click it). This will update
+    Extensionless file for Visual Studio.  Don't worry, it will keep the
+    current extensionless files (STL ones) intact.
+
+--
+
+How to use the Visual Studio projects:
+
+To build the OpenSceneGraph code in Visual Studio, you normally must use the VisualStudio.sln solution file provided.  The individual projects won't build as-is, because they depend on each other and only the VisualStudio.sln file provides those dependencies.
+
+To create a program based on an example, probably the easiest way is to do this:
+
+1. Copy the VisualStudio.sln project to a new file in the same directory
+2. Copy the project you want to base your new project on to a new directory in the same level of the directory tree
+3. Open the new .sln file you copied in step 1
+4. Remove unneeded projects from it, but keep the core libraries (osg, osgDB, etc.).  Shift-clicking to select a bunch of projects at once makes this easier to do
+5. Add the new project to that solution
+6. Set the dependencies for your new project.  This is most easily done by opening the Solution Properties dialog, going to Project Dependencies, and checking off the libraries your project depends on
+
+--
+
+Building 64 bit binaries
+
+64 bit OpenSceneGraph and OpenThreads binaries can be built in Visual Studio 8, but several extra steps are required due to limits of the Visual Studio 6 project files:
+
+1. For each of the OpenSceneGraph, and OpenThreads .dsw files, :
+  a. Open the .dsw or .sln file and convert all projects to VS 8 format.
+  b. Open the Configuration Manager window under the Build menu, bring up the New Solution Platform window by selecting <New...> in the Active solution platform drop-down menu.  Select x64 as the new platform and copy settings from Win32 (you need to have the x64 compiler installed to see the x64 platform option).  Ensure the Create new project platforms checkbox is selected.  Click OK, then close the Configuration Manager window.
+  c. Do a "Save All" to save the project files.
+
+2. Visual Studio unfortunately chooses its own Output Directory setting for the x64 configurations in step 1.b., and this must be reset to the Win32 setting.
+
+  IF PERL _IS_ INSTALLED (native or Cygwin), do the following:
+  a. Close all Visual Studio solutions.
+  b. Open a command shell and cd to the OpenSceneGraph/VisualStudio directory.
+  c. Run the command "perl reset-64bit-outdirs.pl".
+  d. Reopen the solutions.
+
+  IF PERL _IS NOT_ INSTALLED, do the following to accomplish the same thing manually:
+  a. In the OpenThreads solution, open the properties window for the OpenThreads project.
+     i. Select multiple configurations, Debug and Release.  Under the General page, overwrite the Output Directory path of the x64 platform with the corresponding Win32 path.  For static builds, do the same thing for the Debug Static and Release Static configurations.
+  b. In the OpenSceneGraph solution:
+     i. Select all the "Application" and "Example" projects in the Solution Explorer window and repeat step 2.a.i.  Note there are no static configurations.
+     ii. Select all the "Core" projects _except "Core osgIntrospection"_ and repeat step 2.a.i.
+     iii. Select "Core osgIntrospection" and repeat step 2.a.i.  Note there are no static configurations.
+     iv. Select all the "osgPlugin" projects and repeat step 2.a.i.
+     v. Select all the "osgWrapper" projects and repeat step 2.a.i.  Note there are no static configurations.
+  c. Do a "Save All" to save the project files.
+
+3. Select the desired x64 configuration, and build away!

VisualStudio/create_static_workspace.js

@@ -0,0 +1,33 @@
+/* create_static_workspace - Copyright (C) 2006 Joran Jessurun 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+ *
+ * Made by Joran Jessurun (A.J.Jessurun@tue.nl)
+ */ 
+var fso=WScript.createObject("Scripting.FileSystemObject");
+var ForReading=1;
+var ForWriting=2;
+
+WScript.echo("Creating OpenSceneGraphStatic.dsw from OpenSceneGraph.dsw");
+
+var source=fso.openTextFile("OpenSceneGraph.dsw",ForReading);
+var destin=fso.openTextFile("OpenSceneGraphStatic.dsw",ForWriting,true);
+var state=0; // 0=copy, 1=skip
+while(!source.atEndOfStream) {
+  line=source.readLine();
+  if(/Begin Project Dependency/.test(line)) state=1;
+  if(state==0) destin.writeLine(line);
+  if(/End Project Dependency/.test(line)) state=0;  
+}
+source.close();
+destin.close();
+
+WScript.echo("Done");

VisualStudio/highlight70.reg

@@ -0,0 +1,339 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\7.0\Languages\Extensionless Files\{B2F072B0-ABC1-11D0-9D62-00C04FD9DFD9}]
+"AccelOperator"=""
+"AlphaFunc"=""
+"AngularAccelOperator"=""
+"AnimationPath"=""
+"AnimationPathManipulator"=""
+"AnisotropicLighting"=""
+"ApplicationUsage"=""
+"Archive"=""
+"ArgumentParser"=""
+"Array"=""
+"Attributes"=""
+"AutoTransform"=""
+"Billboard"=""
+"BlendColor"=""
+"BlendEquation"=""
+"BlendFunc"=""
+"BlinkSequence"=""
+"BoundingBox"=""
+"BoundingSphere"=""
+"BoundsChecking"=""
+"buffered_value"=""
+"BufferObject"=""
+"BumpMapping"=""
+"Camera"=""
+"CameraView"=""
+"Cartoon"=""
+"CenteredPlacer"=""
+"ClearNode"=""
+"ClipNode"=""
+"ClipPlane"=""
+"ClusterCullingCallback"=""
+"CollectOccludersVisitor"=""
+"ColorMask"=""
+"ColorMatrix"=""
+"ColorRange"=""
+"Comparator"=""
+"CompositeViewer"=""
+"ConnectedParticleSystem"=""
+"ConstantRateCounter"=""
+"ConstructorInfo"=""
+"Converter"=""
+"ConverterProxy"=""
+"ConvexPlanarOccluder"=""
+"ConvexPlanarPolygon"=""
+"CoordinateSystemNode"=""
+"CopyOp"=""
+"Counter"=""
+"CubeMapGenerator"=""
+"CullFace"=""
+"CullingSet"=""
+"CullSettings"=""
+"CullStack"=""
+"CullVisitor"=""
+"CustomAttribute"=""
+"CustomAttributeProvider"=""
+"DatabasePager"=""
+"DelaunayTriangulator"=""
+"Depth"=""
+"DisplayRequirementsVisitor"=""
+"DisplaySettings"=""
+"DOFTransform"=""
+"DotOsgWrapper"=""
+"Drawable"=""
+"DrawPixels"=""
+"DriveManipulator"=""
+"DynamicLibrary"=""
+"Effect"=""
+"Emitter"=""
+"Endian"=""
+"EventAdapter"=""
+"EventVisitor"=""
+"Exceptions"=""
+"ExplosionDebrisEffect"=""
+"ExplosionEffect"=""
+"Export"=""
+"fast_back_stack"=""
+"Field"=""
+"FieldReader"=""
+"FieldReaderIterator"=""
+"FileNameUtils"=""
+"FileUtils"=""
+"FireEffect"=""
+"FlightManipulator"=""
+"FluidFrictionOperator"=""
+"FluidProgram"=""
+"Fog"=""
+"Font"=""
+"ForceOperator"=""
+"FragmentProgram"=""
+"FrameBufferObject"=""
+"FrameStamp"=""
+"FrontFace"=""
+"Geode"=""
+"GeographicLocation"=""
+"Geometry"=""
+"GL"=""
+"GL2Extensions"=""
+"GLExtensions"=""
+"GLObjectsVisitor"=""
+"GLU"=""
+"GraphicsContext"=""
+"GraphicsContextImplementation"=""
+"GraphicsThread"=""
+"GraphicsWindow"=""
+"GraphicsWindowWin32"=""
+"Group"=""
+"GUIActionAdapter"=""
+"GUIEventAdapter"=""
+"GUIEventHandler"=""
+"GUIEventHandlerVisitor"=""
+"HalfWayMapGenerator"=""
+"HelpHandler"=""
+"HeightFieldNode"=""
+"HeightFieldRenderer"=""
+"HighlightMapGenerator"=""
+"Image"=""
+"ImageOptions"=""
+"ImageStream"=""
+"Impostor"=""
+"ImpostorSprite"=""
+"Input"=""
+"InsertImpostorsVisitor"=""
+"InstanceCreator"=""
+"Interpolator"=""
+"IntersectVisitor"=""
+"io_utils"=""
+"KeyboardMouseCallback"=""
+"KeySwitchMatrixManipulator"=""
+"Light"=""
+"LightModel"=""
+"LightPoint"=""
+"LightPointNode"=""
+"LightPointSystem"=""
+"LightSource"=""
+"LinearInterpolator"=""
+"LineSegment"=""
+"LineStipple"=""
+"LineWidth"=""
+"LOD"=""
+"LogicOp"=""
+"Material"=""
+"Math"=""
+"Matrix"=""
+"Matrixd"=""
+"Matrixf"=""
+"MatrixManipulator"=""
+"MatrixTransform"=""
+"MethodInfo"=""
+"ModularEmitter"=""
+"ModularProgram"=""
+"Multisample"=""
+"MultiSegmentPlacer"=""
+"MultiSwitch"=""
+"MultiTextureControl"=""
+"Node"=""
+"NodeCallback"=""
+"NodeTrackerCallback"=""
+"NodeTrackerManipulator"=""
+"NodeVisitor"=""
+"Notify"=""
+"Object"=""
+"OccluderNode"=""
+"Operator"=""
+"Optimizer"=""
+"OsgCameraGroup"=""
+"OsgSceneHandler"=""
+"Output"=""
+"OverlayNode"=""
+"PagedLOD"=""
+"ParameterInfo"=""
+"ParameterOutput"=""
+"Particle"=""
+"ParticleEffect"=""
+"ParticleProcessor"=""
+"ParticleSystem"=""
+"ParticleSystemUpdater"=""
+"Placer"=""
+"Plane"=""
+"Point"=""
+"PointPlacer"=""
+"PointSprite"=""
+"PolygonMode"=""
+"PolygonOffset"=""
+"PolygonStipple"=""
+"Polytope"=""
+"PositionalStateContainer"=""
+"PositionAttitudeTransform"=""
+"PrimitiveSet"=""
+"Program"=""
+"Program"=""
+"Projection"=""
+"PropertyInfo"=""
+"ProxyNode"=""
+"Quat"=""
+"RadialShooter"=""
+"RandomRateCounter"=""
+"range"=""
+"ReaderWriter"=""
+"ReadFile"=""
+"ReentrantMutex"=""
+"ref_ptr"=""
+"Referenced"=""
+"Reflection"=""
+"ReflectionMacros"=""
+"ReflectionMapGenerator"=""
+"Reflector"=""
+"Registry"=""
+"RenderBin"=""
+"RenderLeaf"=""
+"RenderStage"=""
+"ScalarBar"=""
+"ScalarsToColors"=""
+"Scene"=""
+"SceneView"=""
+"Scissor"=""
+"Scribe"=""
+"Sector"=""
+"SectorPlacer"=""
+"SegmentPlacer"=""
+"Sequence"=""
+"SetSceneViewVisitor"=""
+"ShadeModel"=""
+"Shader"=""
+"ShadowVolumeOccluder"=""
+"Shape"=""
+"ShapeDrawable"=""
+"SharedStateManager"=""
+"Shooter"=""
+"SimpleViewer"=""
+"Simplifier"=""
+"SmokeEffect"=""
+"SmokeTrailEffect"=""
+"SmoothingVisitor"=""
+"SpecularHighlights"=""
+"SphereSegment"=""
+"State"=""
+"StateAttribute"=""
+"StateGraph"=""
+"StateSet"=""
+"StateSetManipulator"=""
+"StaticMethodInfo"=""
+"Statistics"=""
+"StatsHandler"=""
+"Stencil"=""
+"String"=""
+"Switch"=""
+"TangentSpaceGenerator"=""
+"Technique"=""
+"TerrainManipulator"=""
+"Tessellator"=""
+"TexEnv"=""
+"TexEnvCombine"=""
+"TexEnvFilter"=""
+"TexGen"=""
+"TexGenNode"=""
+"TexMat"=""
+"Text"=""
+"Texture"=""
+"Texture1D"=""
+"Texture2D"=""
+"Texture3D"=""
+"TextureCubeMap"=""
+"TextureRectangle"=""
+"Timer"=""
+"TrackballManipulator"=""
+"Transform"=""
+"TransformAttributeFunctor"=""
+"TransformCallback"=""
+"TriangleFunctor"=""
+"TriangleIndexFunctor"=""
+"TriStripVisitor"=""
+"Type"=""
+"TypedConstructorInfo"=""
+"TypedMethodInfo"=""
+"TypeNameAliasProxy"=""
+"UFOManipulator"=""
+"Uniform"=""
+"UnitTestFramework"=""
+"UpdateVisitor"=""
+"Utility"=""
+"Validator"=""
+"Value"=""
+"VariableRateCounter"=""
+"variant_cast"=""
+"Vec2"=""
+"Vec2b"=""
+"Vec2d"=""
+"Vec2f"=""
+"Vec2s"=""
+"Vec3"=""
+"Vec3b"=""
+"Vec3d"=""
+"Vec3f"=""
+"Vec3s"=""
+"Vec4"=""
+"Vec4b"=""
+"Vec4d"=""
+"Vec4f"=""
+"Vec4s"=""
+"Vec4ub"=""
+"Version"=""
+"VertexProgram"=""
+"View"=""
+"Viewer"=""
+"ViewerEventHandler"=""
+"Viewport"=""
+"VisibilityGroup"=""
+"WriteFile"=""
+
+"Block"=""
+"BlockingQueue"=""
+"Camera"=""
+"CameraConfig"=""
+"CameraGroup"=""
+"Events"=""
+"Export"=""
+"InputArea"=""
+"Keyboard"=""
+"KeyboardMouse"=""
+"Math"=""
+"Referenced"=""
+"RefOpenThreads"=""
+"RenderSurface"=""
+"Timer"=""
+"Trackball"=""
+"Types"=""
+"Version"=""
+"Window3D"=""
+"VisualChooser"=""
+
+"Barrier"=""
+"Condition"=""
+"Exports"=""
+"Mutex"=""
+"ScopedLock"=""
+"Thread"=""

VisualStudio/highlight71.reg

@@ -0,0 +1,339 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\7.1\Languages\Extensionless Files\{B2F072B0-ABC1-11D0-9D62-00C04FD9DFD9}]
+"AccelOperator"=""
+"AlphaFunc"=""
+"AngularAccelOperator"=""
+"AnimationPath"=""
+"AnimationPathManipulator"=""
+"AnisotropicLighting"=""
+"ApplicationUsage"=""
+"Archive"=""
+"ArgumentParser"=""
+"Array"=""
+"Attributes"=""
+"AutoTransform"=""
+"Billboard"=""
+"BlendColor"=""
+"BlendEquation"=""
+"BlendFunc"=""
+"BlinkSequence"=""
+"BoundingBox"=""
+"BoundingSphere"=""
+"BoundsChecking"=""
+"buffered_value"=""
+"BufferObject"=""
+"BumpMapping"=""
+"Camera"=""
+"CameraView"=""
+"Cartoon"=""
+"CenteredPlacer"=""
+"ClearNode"=""
+"ClipNode"=""
+"ClipPlane"=""
+"ClusterCullingCallback"=""
+"CollectOccludersVisitor"=""
+"ColorMask"=""
+"ColorMatrix"=""
+"ColorRange"=""
+"Comparator"=""
+"CompositeViewer"=""
+"ConnectedParticleSystem"=""
+"ConstantRateCounter"=""
+"ConstructorInfo"=""
+"Converter"=""
+"ConverterProxy"=""
+"ConvexPlanarOccluder"=""
+"ConvexPlanarPolygon"=""
+"CoordinateSystemNode"=""
+"CopyOp"=""
+"Counter"=""
+"CubeMapGenerator"=""
+"CullFace"=""
+"CullingSet"=""
+"CullSettings"=""
+"CullStack"=""
+"CullVisitor"=""
+"CustomAttribute"=""
+"CustomAttributeProvider"=""
+"DatabasePager"=""
+"DelaunayTriangulator"=""
+"Depth"=""
+"DisplayRequirementsVisitor"=""
+"DisplaySettings"=""
+"DOFTransform"=""
+"DotOsgWrapper"=""
+"Drawable"=""
+"DrawPixels"=""
+"DriveManipulator"=""
+"DynamicLibrary"=""
+"Effect"=""
+"Emitter"=""
+"Endian"=""
+"EventAdapter"=""
+"EventVisitor"=""
+"Exceptions"=""
+"ExplosionDebrisEffect"=""
+"ExplosionEffect"=""
+"Export"=""
+"fast_back_stack"=""
+"Field"=""
+"FieldReader"=""
+"FieldReaderIterator"=""
+"FileNameUtils"=""
+"FileUtils"=""
+"FireEffect"=""
+"FlightManipulator"=""
+"FluidFrictionOperator"=""
+"FluidProgram"=""
+"Fog"=""
+"Font"=""
+"ForceOperator"=""
+"FragmentProgram"=""
+"FrameBufferObject"=""
+"FrameStamp"=""
+"FrontFace"=""
+"Geode"=""
+"GeographicLocation"=""
+"Geometry"=""
+"GL"=""
+"GL2Extensions"=""
+"GLExtensions"=""
+"GLObjectsVisitor"=""
+"GLU"=""
+"GraphicsContext"=""
+"GraphicsContextImplementation"=""
+"GraphicsThread"=""
+"GraphicsWindow"=""
+"GraphicsWindowWin32"=""
+"Group"=""
+"GUIActionAdapter"=""
+"GUIEventAdapter"=""
+"GUIEventHandler"=""
+"GUIEventHandlerVisitor"=""
+"HalfWayMapGenerator"=""
+"HelpHandler"=""
+"HeightFieldNode"=""
+"HeightFieldRenderer"=""
+"HighlightMapGenerator"=""
+"Image"=""
+"ImageOptions"=""
+"ImageStream"=""
+"Impostor"=""
+"ImpostorSprite"=""
+"Input"=""
+"InsertImpostorsVisitor"=""
+"InstanceCreator"=""
+"Interpolator"=""
+"IntersectVisitor"=""
+"io_utils"=""
+"KeyboardMouseCallback"=""
+"KeySwitchMatrixManipulator"=""
+"Light"=""
+"LightModel"=""
+"LightPoint"=""
+"LightPointNode"=""
+"LightPointSystem"=""
+"LightSource"=""
+"LinearInterpolator"=""
+"LineSegment"=""
+"LineStipple"=""
+"LineWidth"=""
+"LOD"=""
+"LogicOp"=""
+"Material"=""
+"Math"=""
+"Matrix"=""
+"Matrixd"=""
+"Matrixf"=""
+"MatrixManipulator"=""
+"MatrixTransform"=""
+"MethodInfo"=""
+"ModularEmitter"=""
+"ModularProgram"=""
+"Multisample"=""
+"MultiSegmentPlacer"=""
+"MultiSwitch"=""
+"MultiTextureControl"=""
+"Node"=""
+"NodeCallback"=""
+"NodeTrackerCallback"=""
+"NodeTrackerManipulator"=""
+"NodeVisitor"=""
+"Notify"=""
+"Object"=""
+"OccluderNode"=""
+"Operator"=""
+"Optimizer"=""
+"OsgCameraGroup"=""
+"OsgSceneHandler"=""
+"Output"=""
+"OverlayNode"=""
+"PagedLOD"=""
+"ParameterInfo"=""
+"ParameterOutput"=""
+"Particle"=""
+"ParticleEffect"=""
+"ParticleProcessor"=""
+"ParticleSystem"=""
+"ParticleSystemUpdater"=""
+"Placer"=""
+"Plane"=""
+"Point"=""
+"PointPlacer"=""
+"PointSprite"=""
+"PolygonMode"=""
+"PolygonOffset"=""
+"PolygonStipple"=""
+"Polytope"=""
+"PositionalStateContainer"=""
+"PositionAttitudeTransform"=""
+"PrimitiveSet"=""
+"Program"=""
+"Program"=""
+"Projection"=""
+"PropertyInfo"=""
+"ProxyNode"=""
+"Quat"=""
+"RadialShooter"=""
+"RandomRateCounter"=""
+"range"=""
+"ReaderWriter"=""
+"ReadFile"=""
+"ReentrantMutex"=""
+"ref_ptr"=""
+"Referenced"=""
+"Reflection"=""
+"ReflectionMacros"=""
+"ReflectionMapGenerator"=""
+"Reflector"=""
+"Registry"=""
+"RenderBin"=""
+"RenderLeaf"=""
+"RenderStage"=""
+"ScalarBar"=""
+"ScalarsToColors"=""
+"Scene"=""
+"SceneView"=""
+"Scissor"=""
+"Scribe"=""
+"Sector"=""
+"SectorPlacer"=""
+"SegmentPlacer"=""
+"Sequence"=""
+"SetSceneViewVisitor"=""
+"ShadeModel"=""
+"Shader"=""
+"ShadowVolumeOccluder"=""
+"Shape"=""
+"ShapeDrawable"=""
+"SharedStateManager"=""
+"Shooter"=""
+"SimpleViewer"=""
+"Simplifier"=""
+"SmokeEffect"=""
+"SmokeTrailEffect"=""
+"SmoothingVisitor"=""
+"SpecularHighlights"=""
+"SphereSegment"=""
+"State"=""
+"StateAttribute"=""
+"StateGraph"=""
+"StateSet"=""
+"StateSetManipulator"=""
+"StaticMethodInfo"=""
+"Statistics"=""
+"StatsHandler"=""
+"Stencil"=""
+"String"=""
+"Switch"=""
+"TangentSpaceGenerator"=""
+"Technique"=""
+"TerrainManipulator"=""
+"Tessellator"=""
+"TexEnv"=""
+"TexEnvCombine"=""
+"TexEnvFilter"=""
+"TexGen"=""
+"TexGenNode"=""
+"TexMat"=""
+"Text"=""
+"Texture"=""
+"Texture1D"=""
+"Texture2D"=""
+"Texture3D"=""
+"TextureCubeMap"=""
+"TextureRectangle"=""
+"Timer"=""
+"TrackballManipulator"=""
+"Transform"=""
+"TransformAttributeFunctor"=""
+"TransformCallback"=""
+"TriangleFunctor"=""
+"TriangleIndexFunctor"=""
+"TriStripVisitor"=""
+"Type"=""
+"TypedConstructorInfo"=""
+"TypedMethodInfo"=""
+"TypeNameAliasProxy"=""
+"UFOManipulator"=""
+"Uniform"=""
+"UnitTestFramework"=""
+"UpdateVisitor"=""
+"Utility"=""
+"Validator"=""
+"Value"=""
+"VariableRateCounter"=""
+"variant_cast"=""
+"Vec2"=""
+"Vec2b"=""
+"Vec2d"=""
+"Vec2f"=""
+"Vec2s"=""
+"Vec3"=""
+"Vec3b"=""
+"Vec3d"=""
+"Vec3f"=""
+"Vec3s"=""
+"Vec4"=""
+"Vec4b"=""
+"Vec4d"=""
+"Vec4f"=""
+"Vec4s"=""
+"Vec4ub"=""
+"Version"=""
+"VertexProgram"=""
+"View"=""
+"Viewer"=""
+"ViewerEventHandler"=""
+"Viewport"=""
+"VisibilityGroup"=""
+"WriteFile"=""
+
+"Block"=""
+"BlockingQueue"=""
+"Camera"=""
+"CameraConfig"=""
+"CameraGroup"=""
+"Events"=""
+"Export"=""
+"InputArea"=""
+"Keyboard"=""
+"KeyboardMouse"=""
+"Math"=""
+"Referenced"=""
+"RefOpenThreads"=""
+"RenderSurface"=""
+"Timer"=""
+"Trackball"=""
+"Types"=""
+"Version"=""
+"Window3D"=""
+"VisualChooser"=""
+
+"Barrier"=""
+"Condition"=""
+"Exports"=""
+"Mutex"=""
+"ScopedLock"=""
+"Thread"=""

VisualStudio/highlight80.reg

@@ -0,0 +1,339 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\8.0\Languages\Extensionless Files\{B2F072B0-ABC1-11D0-9D62-00C04FD9DFD9}]
+"AccelOperator"=""
+"AlphaFunc"=""
+"AngularAccelOperator"=""
+"AnimationPath"=""
+"AnimationPathManipulator"=""
+"AnisotropicLighting"=""
+"ApplicationUsage"=""
+"Archive"=""
+"ArgumentParser"=""
+"Array"=""
+"Attributes"=""
+"AutoTransform"=""
+"Billboard"=""
+"BlendColor"=""
+"BlendEquation"=""
+"BlendFunc"=""
+"BlinkSequence"=""
+"BoundingBox"=""
+"BoundingSphere"=""
+"BoundsChecking"=""
+"buffered_value"=""
+"BufferObject"=""
+"BumpMapping"=""
+"Camera"=""
+"CameraView"=""
+"Cartoon"=""
+"CenteredPlacer"=""
+"ClearNode"=""
+"ClipNode"=""
+"ClipPlane"=""
+"ClusterCullingCallback"=""
+"CollectOccludersVisitor"=""
+"ColorMask"=""
+"ColorMatrix"=""
+"ColorRange"=""
+"Comparator"=""
+"CompositeViewer"=""
+"ConnectedParticleSystem"=""
+"ConstantRateCounter"=""
+"ConstructorInfo"=""
+"Converter"=""
+"ConverterProxy"=""
+"ConvexPlanarOccluder"=""
+"ConvexPlanarPolygon"=""
+"CoordinateSystemNode"=""
+"CopyOp"=""
+"Counter"=""
+"CubeMapGenerator"=""
+"CullFace"=""
+"CullingSet"=""
+"CullSettings"=""
+"CullStack"=""
+"CullVisitor"=""
+"CustomAttribute"=""
+"CustomAttributeProvider"=""
+"DatabasePager"=""
+"DelaunayTriangulator"=""
+"Depth"=""
+"DisplayRequirementsVisitor"=""
+"DisplaySettings"=""
+"DOFTransform"=""
+"DotOsgWrapper"=""
+"Drawable"=""
+"DrawPixels"=""
+"DriveManipulator"=""
+"DynamicLibrary"=""
+"Effect"=""
+"Emitter"=""
+"Endian"=""
+"EventAdapter"=""
+"EventVisitor"=""
+"Exceptions"=""
+"ExplosionDebrisEffect"=""
+"ExplosionEffect"=""
+"Export"=""
+"fast_back_stack"=""
+"Field"=""
+"FieldReader"=""
+"FieldReaderIterator"=""
+"FileNameUtils"=""
+"FileUtils"=""
+"FireEffect"=""
+"FlightManipulator"=""
+"FluidFrictionOperator"=""
+"FluidProgram"=""
+"Fog"=""
+"Font"=""
+"ForceOperator"=""
+"FragmentProgram"=""
+"FrameBufferObject"=""
+"FrameStamp"=""
+"FrontFace"=""
+"Geode"=""
+"GeographicLocation"=""
+"Geometry"=""
+"GL"=""
+"GL2Extensions"=""
+"GLExtensions"=""
+"GLObjectsVisitor"=""
+"GLU"=""
+"GraphicsContext"=""
+"GraphicsContextImplementation"=""
+"GraphicsThread"=""
+"GraphicsWindow"=""
+"GraphicsWindowWin32"=""
+"Group"=""
+"GUIActionAdapter"=""
+"GUIEventAdapter"=""
+"GUIEventHandler"=""
+"GUIEventHandlerVisitor"=""
+"HalfWayMapGenerator"=""
+"HelpHandler"=""
+"HeightFieldNode"=""
+"HeightFieldRenderer"=""
+"HighlightMapGenerator"=""
+"Image"=""
+"ImageOptions"=""
+"ImageStream"=""
+"Impostor"=""
+"ImpostorSprite"=""
+"Input"=""
+"InsertImpostorsVisitor"=""
+"InstanceCreator"=""
+"Interpolator"=""
+"IntersectVisitor"=""
+"io_utils"=""
+"KeyboardMouseCallback"=""
+"KeySwitchMatrixManipulator"=""
+"Light"=""
+"LightModel"=""
+"LightPoint"=""
+"LightPointNode"=""
+"LightPointSystem"=""
+"LightSource"=""
+"LinearInterpolator"=""
+"LineSegment"=""
+"LineStipple"=""
+"LineWidth"=""
+"LOD"=""
+"LogicOp"=""
+"Material"=""
+"Math"=""
+"Matrix"=""
+"Matrixd"=""
+"Matrixf"=""
+"MatrixManipulator"=""
+"MatrixTransform"=""
+"MethodInfo"=""
+"ModularEmitter"=""
+"ModularProgram"=""
+"Multisample"=""
+"MultiSegmentPlacer"=""
+"MultiSwitch"=""
+"MultiTextureControl"=""
+"Node"=""
+"NodeCallback"=""
+"NodeTrackerCallback"=""
+"NodeTrackerManipulator"=""
+"NodeVisitor"=""
+"Notify"=""
+"Object"=""
+"OccluderNode"=""
+"Operator"=""
+"Optimizer"=""
+"OsgCameraGroup"=""
+"OsgSceneHandler"=""
+"Output"=""
+"OverlayNode"=""
+"PagedLOD"=""
+"ParameterInfo"=""
+"ParameterOutput"=""
+"Particle"=""
+"ParticleEffect"=""
+"ParticleProcessor"=""
+"ParticleSystem"=""
+"ParticleSystemUpdater"=""
+"Placer"=""
+"Plane"=""
+"Point"=""
+"PointPlacer"=""
+"PointSprite"=""
+"PolygonMode"=""
+"PolygonOffset"=""
+"PolygonStipple"=""
+"Polytope"=""
+"PositionalStateContainer"=""
+"PositionAttitudeTransform"=""
+"PrimitiveSet"=""
+"Program"=""
+"Program"=""
+"Projection"=""
+"PropertyInfo"=""
+"ProxyNode"=""
+"Quat"=""
+"RadialShooter"=""
+"RandomRateCounter"=""
+"range"=""
+"ReaderWriter"=""
+"ReadFile"=""
+"ReentrantMutex"=""
+"ref_ptr"=""
+"Referenced"=""
+"Reflection"=""
+"ReflectionMacros"=""
+"ReflectionMapGenerator"=""
+"Reflector"=""
+"Registry"=""
+"RenderBin"=""
+"RenderLeaf"=""
+"RenderStage"=""
+"ScalarBar"=""
+"ScalarsToColors"=""
+"Scene"=""
+"SceneView"=""
+"Scissor"=""
+"Scribe"=""
+"Sector"=""
+"SectorPlacer"=""
+"SegmentPlacer"=""
+"Sequence"=""
+"SetSceneViewVisitor"=""
+"ShadeModel"=""
+"Shader"=""
+"ShadowVolumeOccluder"=""
+"Shape"=""
+"ShapeDrawable"=""
+"SharedStateManager"=""
+"Shooter"=""
+"SimpleViewer"=""
+"Simplifier"=""
+"SmokeEffect"=""
+"SmokeTrailEffect"=""
+"SmoothingVisitor"=""
+"SpecularHighlights"=""
+"SphereSegment"=""
+"State"=""
+"StateAttribute"=""
+"StateGraph"=""
+"StateSet"=""
+"StateSetManipulator"=""
+"StaticMethodInfo"=""
+"Statistics"=""
+"StatsHandler"=""
+"Stencil"=""
+"String"=""
+"Switch"=""
+"TangentSpaceGenerator"=""
+"Technique"=""
+"TerrainManipulator"=""
+"Tessellator"=""
+"TexEnv"=""
+"TexEnvCombine"=""
+"TexEnvFilter"=""
+"TexGen"=""
+"TexGenNode"=""
+"TexMat"=""
+"Text"=""
+"Texture"=""
+"Texture1D"=""
+"Texture2D"=""
+"Texture3D"=""
+"TextureCubeMap"=""
+"TextureRectangle"=""
+"Timer"=""
+"TrackballManipulator"=""
+"Transform"=""
+"TransformAttributeFunctor"=""
+"TransformCallback"=""
+"TriangleFunctor"=""
+"TriangleIndexFunctor"=""
+"TriStripVisitor"=""
+"Type"=""
+"TypedConstructorInfo"=""
+"TypedMethodInfo"=""
+"TypeNameAliasProxy"=""
+"UFOManipulator"=""
+"Uniform"=""
+"UnitTestFramework"=""
+"UpdateVisitor"=""
+"Utility"=""
+"Validator"=""
+"Value"=""
+"VariableRateCounter"=""
+"variant_cast"=""
+"Vec2"=""
+"Vec2b"=""
+"Vec2d"=""
+"Vec2f"=""
+"Vec2s"=""
+"Vec3"=""
+"Vec3b"=""
+"Vec3d"=""
+"Vec3f"=""
+"Vec3s"=""
+"Vec4"=""
+"Vec4b"=""
+"Vec4d"=""
+"Vec4f"=""
+"Vec4s"=""
+"Vec4ub"=""
+"Version"=""
+"VertexProgram"=""
+"View"=""
+"Viewer"=""
+"ViewerEventHandler"=""
+"Viewport"=""
+"VisibilityGroup"=""
+"WriteFile"=""
+
+"Block"=""
+"BlockingQueue"=""
+"Camera"=""
+"CameraConfig"=""
+"CameraGroup"=""
+"Events"=""
+"Export"=""
+"InputArea"=""
+"Keyboard"=""
+"KeyboardMouse"=""
+"Math"=""
+"Referenced"=""
+"RefOpenThreads"=""
+"RenderSurface"=""
+"Timer"=""
+"Trackball"=""
+"Types"=""
+"Version"=""
+"Window3D"=""
+"VisualChooser"=""
+
+"Barrier"=""
+"Condition"=""
+"Exports"=""
+"Mutex"=""
+"ScopedLock"=""
+"Thread"=""

VisualStudio/osgShell.bat

@@ -5,8 +5,8 @@ REM trees.
 REM mew 2004-07-16
 
 cd ..\..
-set PATH=%CD%\OpenThreads\bin\win32;%CD%\bin;%CD%\3rdParty\bin;%PATH%
-set OSG_FILE_PATH=%CD%\OpenSceneGraph-Data;%OSG_FILE_PATH%
+set PATH=%CD%\OpenThreads\bin\win32;%CD%\OpenSceneGraph\bin\win32;%CD%\3rdParty\bin;%PATH%
+set OSG_FILE_PATH=%CD%\OpenSceneGraph-Data;%CD%\OpenSceneGraph-Data\Images;%CD%\OpenSceneGraph-Data\fonts;%OSG_FILE_PATH%
 
 REM uncomment one of these for your desired notify level...
 rem set OSG_NOTIFY_LEVEL=ALWAYS

Xcode/OSX_OSG_README.rtf

@@ -1,177 +1,48 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 Courier;\f2\fnil\fcharset0 Monaco;
-}
+{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf440
+{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
+\f3\fmodern\fcharset77 Courier;\f4\fnil\fcharset77 Monaco;}
 {\colortbl;\red255\green255\blue255;}
 {\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid1}
-{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid2}
-{\list\listtemplateid3\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid3}}
-{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}}
+{\list\listtemplateid2\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid2}}
+{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}}
 \margl1440\margr1440\vieww11520\viewh13720\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
 \f0\b\fs24 \cf0 OpenSceneGraph on Mac OS X
-\b0 \
+\f1\b0 \
 \
-This is the readme for the entire OpenThreads/OpenSceneGraph distribution for the OS X frameworks and Xcode projects. This readme was originally written for the binary distribution, but there is a lot of useful information in here so it has also been included with the source code in the Xcode section. This was sync'd with the OSG 2.2 release.\
+This is the readme for the entire OpenThreads/OpenSceneGraph distribution for the OS X frameworks and Xcode projects. This readme was originally written for the binary distribution, but there is a lot of useful information in here so it has also been included with the source code in the Xcode section. This was sync'd with the OSG 1.2 release.\
 \
 The source code is available at {\field{\*\fldinst{HYPERLINK "http://www.openscenegraph.org/"}}{\fldrslt http://www.openscenegraph.org/}}\
 \
 
-\b \
+\f0\b \
 Quick Start:
-\b0 \
+\f1\b0 \
 Screencasts of how to install and get going with OSG for Mac OS X can be found here:\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-{\field{\*\fldinst{HYPERLINK "http://www.openscenegraph.org/projects/osg/wiki/Support/Tutorials/MacOSXTips"}}{\fldrslt \cf0 http://www.openscenegraph.org/projects/osg/wiki/Support/Tutorials/MacOSXTips}}\
-\pard\pardeftab720\ql\qnatural
-\cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-
-\b \cf0 Special Notes for Leopard:\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-
-\b0 \cf0 (See {\field{\*\fldinst{HYPERLINK "http://www.openscenegraph.org/projects/osg/wiki/Support/PlatformSpecifics/MacOSX10.5"}}{\fldrslt http://www.openscenegraph.org/projects/osg/wiki/Support/PlatformSpecifics/MacOSX10.5}} for up-to-date information.)\
+{\field{\*\fldinst{HYPERLINK "http://www.openscenegraph.org/projects/osg/wiki/Support/TipsAndTricks"}}{\fldrslt \cf0 http://www.openscenegraph.org/projects/osg/wiki/Support/TipsAndTricks}}\
 \
-
-\b Broken Binary Compatibility:
-\b0 \
-Apple has broken binary compatibility in a limited way between 10.4 and 10.5 when using OpenGL and C++. Under 32-bit, the GLenum type was changed from long (in 10.4 and before) to int (in 10.5).\
-\
-Under 32-bit, sizeof(long) == sizeof(int) == 4-bytes.\
-(In 64-bit, sizeof(long) == 8-bytes, sizeof(int) == 4-bytes)\
-So in C 32-bit, binary compatibility is preserved.\
-\
-But under C++, even though both types are 4-bytes under 32-bits, C++ name mangling rules treat int and long as fundamentally different types. Thus binary compatibility is broken if you try linking two pieces of code that use different types for GLenum.\
-\
-\
-This means:\
-1) If you have a 10.4 SDK (or before) built OSG framework, you cannot build an application using the 10.5 SDK or you will get strange undefined symbol errors if GLenum is used. This means don't develop against the 10.5 SDK on Leopard.\
-\
-2) You cannot use a 10.5 SDK built OSG framework to build an application using the 10.4 SDK, otherwise this will also give you undefined symbol errors. This means don't develop with 10.5 built OSG frameworks when using the 10.4u SDK on Leopard or developing on 10.4 itself.\
-\
-3) If you have a 10.4 SDK built OSG framework and a 10.4 SDK built application that uses it, this does *not* present a binary compatibility problem and you may be able to run on 10.5 (ignoring any different compatibility issues).\
-\
-4) Similarly to #3, if you have a 10.5 SDK built framework and a 10.5 SDK built application that uses it, this does *not* present a binary compatibility problem  and you may be able to run on 10.4 presuming there are no specific 10.5 dependencies. (But it is safer to build against the 10.4 SDK if you plan on deploying to 10.4 and use no 10.5 specific features.)\
-\
-Basically, this means you can't intermix 10.4 and 10.5 frameworks.\
-\
-You can slip around this problem if you manage to avoid the use of any code that uses GLenum. And pure C is not affected.\
-\
-
-\b \
-OSG 10.4 and 10.5 SDKs:\
-
-\b0 Xcode 3.0 introduces formal support for SDKs created by 3rd parties (like us). Since we now have binary incompatible frameworks, developing binaries for both 10.4 and 10.5 on the same system is a pain. Having a separate OSG 10.4 and 10.5 SDK may help minimize that pain.\
-\
-Stay tuned for the SDKs and instructions.\
-\
-\
-\
-
-\b X11 Link problems:\
-
-\b0 Another common problem developers might experience is:\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-\cf0 ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib\
-collect2: ld returned 1 exit status\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \
-Apple has a posted a Technical Q&A (QA1567) on this entitled "Compiling X11 / OpenGL applications on Mac OS X v.10.5 Leopard"\
-{\field{\*\fldinst{HYPERLINK "http://developer.apple.com/qa/qa2007/qa1567.html"}}{\fldrslt http://developer.apple.com/qa/qa2007/qa1567.html\
-}}\
-Some people have reported a problem similar to this and/or used the solution posted in this Q&A to resolve a problem building the osgdb_freetype plugin. However, I believe this is the wrong solution to this specific problem. In the osgdb_freetype case, the problem was one of two things:\
-1) The wrong libfreetype.dylib was being used (wrong SDK)\
-2) The libfreetype.dylib was not found (wrong path)\
-\
-For #1, the Xcode project was linking to /usr/X11R6/lib, but we should have been linking to $(SDKROOT)/usr/X11R6/lib. You would normally experience this problem when compiling against the 10.4u SDK on 10.5.\
-\
-For #2, the problem was usually experienced by people building against the 10.5 SDK (on 10.5). The problem here is that Leopard has moved from XFree86.org to X.org and the path is now /usr/X11/lib instead of X11R6. Within the SDK, there is no X11R6 path, so the library was not found.\
-\
-The solution is quite simple and change the link path line to:\
--L$(SDKROOT)/usr/X11/lib -L$(SDKROOT)/usr/X11R6/lib in the Other Linker Flags for the osgdb_freetype plugin.\
-\
-This is now fixed in the Xcode project in Subversion.\
-\
-\
-\
-
-\b CMake:\
-
-\b0 The CMake/OSG build system is still not quite ready for prime time. CMake has some general Leopard issues and the OS X/CMake community is trying to work through SDK support issues as the SDKs have become a more prominent part of building on OS X correctly. Framework support is still lacking in the CMake/OSG build system, though CMake CVS is gradually adding/fixing this feature to its code base. \
-\
-\
-
-\b 64-bit:\
-
-\b0 OSG for OS X 64-bit is not ready. There are two major obstacles:\
-1) osgViewer\
-2) osgdb_qt\
-\
-The osgViewer backend is written in Carbon and as far as I know, uses some deprecated APIs that are not available in 64-bit. I do not know if this can be easily cleaned up or not. However, I still believe the better long term solution is for a Cocoa based osgViewer backend to be written. However, nothing yet has been written for this as far as I know.\
-\
-The example, osgviewerCocoa is close to if not already 64-bit clean. However, because the example uses osgViewer::GraphicsWindowEmbedded which needlessly pulls in all the osgViewer Carbon backend dependencies, you will be unable to actually build osgviewerCocoa as 64-bit. But if you are in a hurry to get 64-bit on OS X, this might be where you want to start. Either strip away the Carbon dependencies from osgViewer, or take osgviewerCocoa and transform it into a Cocoa backend for osgViewer.\
-\
-\
-osgdb_qt is a QuickTime based plugin that handles all image handling and movie handling on OS X. However, it is based on the old QuickTime API which has been marked deprecated and will not survive the 64-bit transition. Thus this plugin needs to be replaced.\
-\
-I have already submitted a new plugin called osgdb_ImageIO to osgSubmissions which attempts to assume all the image handling duties. This plugin is based on Apple's ImageIO framework which is the new low-level entry point to deal with all image types handled by the platform. Thus this plugin should handle a lot more image formats than the old QuickTime plugin (e.g. JPEG2000, RAW, etc) and will get more as Apple adds support their system. It also adds support for C++ stream support which was missing from the QuickTime plugin. ImageIO is available on 10.4 and 10.5.\
-\
-However, the osgdb_ImageIO plugin does not handle movies unlike the old QuickTime plugin. The current plan is to introduce a second plugin (osgdb_QTKit), which is based on the new QuickTime Kit framework (10.4 and 10.5). This plugin will replace the movie handling capabilities of the old QuickTime plugin. \
-\
-Once both new plugins are in place and osgViewer is sorted out, we should be able to build a 32-bit/64-bit Universal Binary of OSG for OS X.\
-\
-Mac OS X 10.3 and earlier users and QuickTime for Windows users will still need to use the old QuickTime plugin.\
-\
-
-\b Xcode Project Templates:\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-
-\b0 \cf0 Xcode 3.0 has moved things around. The old location was:\
-/Library/Application Support/Apple/Developer Tools/Project Templates/Application\
-\
-The new scheme is:\
-/Library/Application Support/Developer/\{3.0,Shared\}/Xcode/Project Templates/Application\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \
-\pard\pardeftab720\ql\qnatural
-\cf0 Specifying 3.0 will restrict them to only be available in Xcode 3.0, specifying Shared will make them available to 2.5, 3.0 and beyond.\
-\
-I believe our templates will work in both, so Shared is a good location:\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-\cf0 /Library/Application Support/Developer/Shared/Xcode/Project Templates/Application\
-\
-Also note you may place it in per-user locations, e.g.\
-~/Library/Application Support/Developer/Shared/Xcode/Project Templates/Application\
-\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \
 \
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\b \cf0 What's New in this release (2.2):
-\b0 \
+\f0\b \cf0 What's New in this release:
+\f1\b0 \
 \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\ql\qnatural\pardirnatural
-\ls1\ilvl0\cf0 (Sorry, no OS X specific notes.)\
+\ls1\ilvl0\cf0 {\listtext	\'a5	}OpenThreads now uses Subversion 'externals' to make it look like part of the OSG source distribution.\
+{\listtext	\'a5	}Producer has been removed from the distribution. osgViewer is supposed to replace it. The Mac OS X backend is currently Carbon based.\
+{\listtext	\'a5	}GDAL has been removed as it is no longer a dependency.\
+{\listtext	\'a5	}osgviewerCocoa (previously osgsimpleviewerCocoa in CVS) is an example program demonstrating  tight integration between OpenSceneGraph and Cocoa. It demonstrates many of the things you should consider in building a first-class OS X application that uses OSG.\
+{\listtext	\'a5	}Dwarf debugging format\
+{\listtext	\'a5	}osgsimpleviewerSDL\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 \cf0 \
 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\b \cf0 Notes for 2.0 release:\
-\pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\ql\qnatural\pardirnatural
-\ls2\ilvl0
-\b0 \cf0 {\listtext	\'95	}OpenThreads now uses Subversion 'externals' to make it look like part of the OSG source distribution.\
-{\listtext	\'95	}Producer has been removed from the distribution. osgViewer is supposed to replace it. The Mac OS X backend is currently Carbon based.\
-{\listtext	\'95	}GDAL has been removed as it is no longer a dependency.\
-{\listtext	\'95	}osgviewerCocoa (previously osgsimpleviewerCocoa in CVS) is an example program demonstrating  tight integration between OpenSceneGraph and Cocoa. It demonstrates many of the things you should consider in building a first-class OS X application that uses OSG.\
-{\listtext	\'95	}Dwarf debugging format\
-{\listtext	\'95	}osgsimpleviewerSDL\
-\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 OSG has changed its versioning number scheme. 2.0 is the stable release following 1.2.\
+\f0\b Notes for 2.0 release:\
+
+\f1\b0 OSG has changed its versioning number scheme. 2.0 is the stable release following 1.2.\
 \
 Producer has been removed from the distribution with osgViewer as its intended replacement.\
 \
@@ -183,20 +54,18 @@ With Leopard on the horizon, the need to deal with 64-bit readiness and deprecat
 \
 \
 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\b \cf0 Notes for 1.2 release:\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+\f0\b Notes for 1.2 release:\
 
-\b0 \cf0 1.2 was originally intended as a bug fix release for 1.1 (going for 1.1.1), but OSG broke ABI again so the number was bumped to 1.2. There are no significant changes to the Xcode projects or significant OS X specific changes.\
+\f1\b0 1.2 was originally intended as a bug fix release for 1.1 (going for 1.1.1), but OSG broke ABI again so the number was bumped to 1.2. There are no significant changes to the Xcode projects or significant OS X specific changes.\
 \
 Since the 1.1 release, we have learned of serious problems (freezing of the window manager) on the (Intel) MacBook Pros using osgText. We believe the problem is with a serious driver bug for ATI in OS X 10.4.7. We believe the bug affects the ATI Radeon X1600. (You can get this string by calling glGetString(GL_RENDERER) when you have a valid OpenGL Context. The string returned to us on affected MacBook Pros is "ATI Radeon X1600 OpenGL Engine".)\
 \
 Robert Osfield says:\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\ri0\ql\qnatural\pardirnatural
 
-\i \cf0 osgText subloads small glyphs one by one rather than the whole image, so I'd suspect it is this that is broken.  There is a path way in osgText::Font for uploading the whole image at once, which original was specifically implement as a work around for an Octane driver bug, but for 1.1 I enabled this pathway to be selectable via an env var to see if OSX users could work around the OSX driver bug. 
-\i0 \
+\f2\i \cf0 osgText subloads small glyphs one by one rather than the whole image, so I'd suspect it is this that is broken.  There is a path way in osgText::Font for uploading the whole image at once, which original was specifically implement as a work around for an Octane driver bug, but for 1.1 I enabled this pathway to be selectable via an env var to see if OSX users could work around the OSX driver bug. 
+\f1\i0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ri0\ql\qnatural\pardirnatural
 \cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
@@ -215,10 +84,10 @@ James Hopper suggests another solution that doesn't require you to launch throug
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx9360\li720\ri0\ql\qnatural\pardirnatural
 
-\i \cf0 you can set environement variables that work with applications by creating a file ~/.MacOSX/.environment.plist and put them in there. easiest way is to use the preference pane called RCEnvironment at\
+\f2\i \cf0 you can set environement variables that work with applications by creating a file ~/.MacOSX/.environment.plist and put them in there. easiest way is to use the preference pane called RCEnvironment at\
 \
 {\field{\*\fldinst{HYPERLINK "http://www.rubicode.com/Software/RCEnvironment/"}}{\fldrslt http://www.rubicode.com/Software/RCEnvironment/}}
-\i0 \
+\f1\i0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 \cf0 \
 \
@@ -256,15 +125,14 @@ If you are affected by this, please file a bug report at {\field{\*\fldinst{HYPE
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\i \cf0 (Note: We believe this has been fixed in 10.4.8)
-\i0 \
+\f2\i \cf0 (Note: We believe this has been fixed in 10.4.8)
+\f1\i0 \
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\b \cf0 Notes for 1.1 release:\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+\f0\b \cf0 Notes for 1.1 release:\
 
-\b0 \cf0 We are now distributing Universal Binaries. These binaries were built using Xcode 2.3 and gcc 4.0.1.\
+\f1\b0 We are now distributing Universal Binaries. These binaries were built using Xcode 2.3 and gcc 4.0.1.\
 The Xcode projects are also set to build as Universal Binaries for both Development and Deployment\
 targets. If you do not need this and want to save build time, you should change the architecture option\
 to your desired setting (most likely to $(NATIVE_ARCH)). It is overridden in the top-level "OpenSceneGraph" project in the Group & Files panel. Don't forget to change OpenThreads \
@@ -285,10 +153,9 @@ PlugIns, the file size shrunk from about 1GB to about 100MB.\
 We have stopped maintaining the Xcode 1.5/2.0 projects.\
 \
 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\b \cf0 Notes for 1.0 release:
-\b0 \
+\f0\b Notes for 1.0 release:
+\f1\b0 \
 These projects were primarily developed with gcc 4.0.1 under Tiger 10.4.3 using Xcode 2.2. Starting with gcc 4.0, Apple no longer statically links in the C++ runtime. Apple has made available the g++ 4.0 dynamic runtime for Panther under the 10.3.9 release. To run under Panther, your system must have this update (or you must recompile the binaries for your system).\
 \
 With gcc 4.0, serious bugs have been fixed from gcc 3.3 and new features are available to us so we have experimented with more aggressive optimizations. For these binaries we have enabled -O3 optimization and -mtune=G5. We have also enabled autovectorization. We also enabled -fvisibility-inlines-hidden which is expected to shrink the binary sizes, but noticed very little difference. (There may be something wrong.) We have not done the proper benchmarking with these options, so feedback is welcome.\
@@ -300,8 +167,8 @@ With Apple's announcement of the Intel transition, Xcode 2.1 was released to hel
 \
 \
 
-\b Acknowledgments:
-\b0 \
+\f0\b Acknowledgments:
+\f1\b0 \
 \
 Many thanks should be given to the people that have helped make these projects possible and for their contributions to make OSG run well on OS X through the multiyear run-up to 1.0. I unfortunately don't have a comprehensive list as many contributions have been submitted directly to OpenSceneGraph, but I wanted to give mention to these specific people I've had the pleasure of working with in trying to make this corner of the universe work.\
 \
@@ -309,14 +176,14 @@ James Hopper (work on Xcode templates, GDAL frameworks)\
 David Guthrie (various patches, testing, Xcode project compiler options refinement)\
 Jeremy Bell (original comprehensive discussion on OS X frameworks, patches)\
 Stephen Travis Pope (provider of the OSG on OS X website)\
-Markus St\'f6be (web site design, documentation reviewer and formatter)\
+Markus St\'9abe (web site design, documentation reviewer and formatter)\
 (And for the curious) Eric Wing (Xcode projects and frameworks, patches, documentation)\
 \
 \
 \
 
-\b Installation:
-\b0 \
+\f0\b Installation:
+\f1\b0 \
 \
 To "Install" the Frameworks, copy the Frameworks inside the \
 frameworks folder to a standard location.\
@@ -353,8 +220,8 @@ Also be aware that if using the 10.4 Universal SDK, you may have to explicitly s
 \
 \
 
-\b Running the examples:
-\b0 \
+\f0\b Running the examples:
+\f1\b0 \
 \
 Now that osgViewer supports a native Window manager, we have attempted to provide double clickable .app bundles. We cheat a little to keep the download size smaller by symbolically linking the Frameworks, PlugIns, and Resources directories for each .app bundle instead of giving each its own copy. This allows the apps to find their resources when trying to run directly from the .dmg without having to copy anything to your computer. \
 \
@@ -386,15 +253,14 @@ Also remember that OSG will still respond to standard OSG environmental variable
 \
 \
 
-\b Prebinding Addresses:\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
+\f0\b Prebinding Addresses:\
 
-\b0 \cf0 \
+\f1\b0 \
 	These are now obsolete. Prebinding is now disabled. The old addresses were:\
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\f1 \cf0 OpenThreads       -seg1addr 0x1FF00000\
+\f3 \cf0 OpenThreads       -seg1addr 0x1FF00000\
 osg               -seg1addr 0x1FF10000\
 osgUtil           -seg1addr 0x20230000\
 osgDB             -seg1addr 0x20380000\
@@ -407,13 +273,13 @@ osgFX             -seg1addr 0x20690000\
 osgViweer          -seg1addr 0x20700000\
 gdal              -seg1addr 0x207d0000\
 osgTerrain        -seg1addr 0x20c40000
-\f0 \
+\f1 \
 \
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\b \cf0 Xcode Projects:
-\b0 \
+\f0\b \cf0 Xcode Projects:
+\f1\b0 \
 \
 The Xcode Projects are now included as part of the official OpenSceneGraph distribution.\
 \
@@ -422,38 +288,20 @@ Xcode 2.0 and below have the extension .xcode (no longer maintained)\
 \
 \
 
-\b Xcode Templates:\
+\f0\b Xcode Templates:\
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
-\b0 \cf0 \
+\f1\b0 \cf0 \
 We have included a "New Project" template for OpenSceneGraph projects. We recommend you place the "OSG Application" folder into either:\
 \
-Xcode 2.4 and before:\
 /Library/Application Support/Apple/Developer Tools/Project Templates/Appllcation (for system-wide)
-\b \
+\f0\b \
 
-\b0 ~/Library/Application Support/Apple/Developer Tools/Project Templates/Appllcation (for per-user)
-\b \
+\f1\b0 ~/Library/Application Support/Apple/Developer Tools/Project Templates/Appllcation (for per-user)
+\f0\b \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\b0 \cf0 \
-Xcode 2.5/3.0:\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-\cf0 System-wide:\
-/Library/Application Support/Developer/Shared/Xcode/Project Templates/Application (both 2.5 and 3.0)\
-/Library/Application Support/Developer/3.0/Xcode/Project Templates/Application (3.0 only)\
-/Library/Application Support/Developer/2.5/Xcode/Project Templates/Application (2.5 only)\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \
-Per-user\
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-\cf0 ~/Library/Application Support/Developer/Shared/Xcode/Project Templates/Application (both 2.5 and 3.0)\
-~/Library/Application Support/Developer/3.0/Xcode/Project Templates/Application (3.0 only)\
-~/Library/Application Support/Developer/2.5/Xcode/Project Templates/Application (2.5 only)\
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
-\cf0 \
-\
-\
+\f1\b0 \cf0 \
 After doing this, when doing a File->New Project, you will see "OSG Application" under the Application category. Selecting this will create a simple OSG project with some sample source code already in place which currently renders 2 colored tetrahedrons.\
 \
 All the OSG related frameworks are listed already, though gdal and osgTerrain are not checked by default. To link against them, you must check their checkboxes to enable them. Feel free to uncheck or remove frameworks you don't need.\
@@ -474,8 +322,8 @@ Finally, there may still be issues with Zerolink. If you have problems seeing th
 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\b \cf0 Compatibility:
-\b0 \
+\f0\b \cf0 Compatibility:
+\f1\b0 \
 \
 The binaries are built using gcc 4.0.1 under Tiger 10.4.7. These binaries also will run under Panther 10.3.9 (which has the needed C++ runtime library). \
 \
@@ -485,39 +333,38 @@ Also keep in mind that the prebinding addresses are finicky. Changing the compil
 \
 If you are compiling under Xcode 1.5 and are using our Xcode 1.5/2.0 projects, there have been reports of problems I have been unable to reproduce. If you do encounter these problems, please try the following. \
 \pard\tx220\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\li720\fi-720\ql\qnatural\pardirnatural
-\ls3\ilvl0\cf0 {\listtext	\'95	}I have more rigorously tested the Deployment build style than the Development build style so use the Deployment build style. Make sure you are compiling using -Os or -O0 optimization. -O3 is known to have problems under gcc 3.3. \
-{\listtext	\'95	}The -mtune=G4 is has been tested more under Xcode 1.5 than -mtune=G5. \
-{\listtext	\'95	}I noticed that for some reason, Xcode has problems compiling the Carbon header with the OpenThreads framework when autovectorization and precompiled headers were enabled. You might try disabling precompiled headers if it is not already. If the problem persists, you may also need to delete the entry that enables autovectorization. In the Groups and Files panel (left side panel), open the Info inspector for the project (top item) and click on the Build tab. Scroll down to the bottom, and remove the autovectorization option. \
+\ls2\ilvl0\cf0 {\listtext	\'a5	}I have more rigorously tested the Deployment build style than the Development build style so use the Deployment build style. Make sure you are compiling using -Os or -O0 optimization. -O3 is known to have problems under gcc 3.3. \
+{\listtext	\'a5	}The -mtune=G4 is has been tested more under Xcode 1.5 than -mtune=G5. \
+{\listtext	\'a5	}I noticed that for some reason, Xcode has problems compiling the Carbon header with the OpenThreads framework when autovectorization and precompiled headers were enabled. You might try disabling precompiled headers if it is not already. If the problem persists, you may also need to delete the entry that enables autovectorization. In the Groups and Files panel (left side panel), open the Info inspector for the project (top item) and click on the Build tab. Scroll down to the bottom, and remove the autovectorization option. \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 \cf0 \
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
-\b \cf0 Universal Binaries:
-\b0 \
+\f0\b Universal Binaries:
+\f1\b0 \
 \
 Be aware, when building you're own Universal Binaries and you use the 10.4 SDK, you must explicitly\
 list the search path to the frameworks in the project options. It seems that using any SDK will cause\
 the standard places like /Library/Frameworks to not be searched.\
 \
 
-\b Known Issues:
-\b0 \
+\f0\b Known Issues:
+\f1\b0 \
 \
 There is one known serious bug that appears sometimes. With Xcode 2.0 and 2.1, in some cases when you build OpenThreads/OSG from scratch, when you run the examples, they will crash on load. The workaround seems to be to delete just the OpenThreads framework after everything is built. Then rebuild just the OpenThreads framework. Bug reports have been filed with Apple, but the root cause remains to be a mystery. (We have some guesses, but nothing substantial.) I have not yet seen this issue emerge with Xcode 2.2, so maybe the problem is fixed.\
 \
 The osgdb_geo plugin is not big endian safe. The Makefile system does not build it for OS X. We have added it for the Xcode projects, but you probably shouldn't use it unless you're on Intel.\
 \
 Do not use the 
-\f2\fs22 -fvisibility=hidden 
-\f0\fs24 flag unless you know what you're doing. In some cases, Xcode 2.2 seems to enable this by default in the project settings. You should verify your project settings and make sure this is disabled. Among other things, this flag will hide RTTI information causing dynamic_cast<> operations to fail. Since parts of OSG are dependent on RTTI, this option should remain off. The flag 
-\f2\fs22 -fvisibility-inlines-hidden 
-\f0\fs24 may be safe to use. (This is actually enabled in our Xcode projects. If there are problems, please let us know.)\
+\f4\fs22 -fvisibility=hidden 
+\f1\fs24 flag unless you know what you're doing. In some cases, Xcode 2.2 seems to enable this by default in the project settings. You should verify your project settings and make sure this is disabled. Among other things, this flag will hide RTTI information causing dynamic_cast<> operations to fail. Since parts of OSG are dependent on RTTI, this option should remain off. The flag 
+\f4\fs22 -fvisibility-inlines-hidden 
+\f1\fs24 may be safe to use. (This is actually enabled in our Xcode projects. If there are problems, please let us know.)\
 \
 Finally, there may still be issues with Zerolink. In the Project Template, we defer to the default for this option and in current Xcode versions, the default is on. The OSG Xcode projects themselves have explicitly disabled Zerolink. In the worst cases, scenes will not render correctly or the application may crash. The worst thing about this is that the problems are so strange, you may not realize Zerolink is the problem. To see this for yourself (we tried in Xcode 2.2), you might try comparing the osgdelaunay example with and without Zerolink, toggling through all values of 'n'. With Zerolink certain objects do not even appear and it crashes. So you are probably should disable this to be safe. However, for the daring, Zerolink does seem to work for some projects though we do not fully understand the criteria for this. Furthermore, Apple constantly works on improving this feature so maybe one day it will all just work right.\
 \
 
-\b Misc:
-\b0 \
+\f0\b Misc:
+\f1\b0 \
 \
 Included with the OSG Xcode projects are some of the little scripts I used to help put everything together. The build script might be of interest to those who wish to produce their own automated nightly builds.\
 \
@@ -533,7 +380,7 @@ On the topic of feature requests, another potentially useful thing to have is a
 \
 \
 -Eric Wing\
-ewing . public  - at -  gmail (in the commercial domain)\
+ewing 2121  - at -  yahoo (in the commercial domain)\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 {\field{\*\fldinst{HYPERLINK "http://www.create.ucsb.edu/OSG/"}}{\fldrslt \cf0 http://www.create.ucsb.edu/OSG/}}\
 }

Xcode/OpenSceneGraph/config/OpenThreads/Config

@@ -1,20 +0,0 @@
-#ifndef _OPENTHREADS_CONFIG
-#define _OPENTHREADS_CONFIG
-
-#include <AvailabilityMacros.h>
-
-#define _OPENTHREADS_ATOMIC_USE_MUTEX
-
-#if defined(MAC_OS_X_VERSION_10_5)
-    #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
-        #define _OPENTHREADS_ATOMIC_USE_BSD_ATOMIC
-        #undef _OPENTHREADS_ATOMIC_USE_MUTEX
-    #endif
-#endif
-/* #undef _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS */
-/* #undef _OPENTHREADS_ATOMIC_USE_MIPOSPRO_BUILTINS */
-/* #undef _OPENTHREADS_ATOMIC_USE_SUN */
-/* #undef _OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED */
-/* #undef _OPENTHREADS_ATOMIC_USE_MUTEX */
-
-#endif

Xcode/OpenSceneGraph/config/osg/Config

@@ -1,10 +0,0 @@
-#ifndef OSG_CONFIG
-#define OSG_CONFIG 1
-
-/* #undef OSG_USE_FLOAT_MATRIX */
-/* #undef OSG_USE_FLOAT_PLANE */
-#define OSG_USE_FLOAT_BOUNDINGSPHERE
-#define OSG_USE_FLOAT_BOUNDINGBOX
-/* #undef OSG_ENFORCE_THREADSAFE */
-
-#endif

Xcode/OpenSceneGraph/os-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.os</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osg-Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgAnimation-Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>osgAnimation</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>org.OpenSceneGraph.osgAnimation</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>2.7.0</string>
-</dict>
-</plist>

Xcode/OpenSceneGraph/osgDB-Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgFX-Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgGA-Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgGL2-Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0d1</string>
+	<string>2.0.0d1</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgGLUTkeyboardmouse-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.osgGLUTkeyboardmouse</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgGLUTsimple-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.osgGLUTsimple</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgManipulator-Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgParticle-Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgShadow-Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgSim-Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgTerrain-Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgText-Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgUtil-Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgViewer-Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgVolume-Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>osgVolume</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>org.OpenSceneGraph.osgVolume</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>2.7.0</string>
-</dict>
-</plist>

Xcode/OpenSceneGraph/osgWidget-Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>osgWidget</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>org.OpenSceneGraph.osgWidget</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
-</dict>
-</plist>

Xcode/OpenSceneGraph/osgWidget.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>osgWidget</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>org.OpenSceneGraph.osgWidget</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
-</dict>
-</plist>

Xcode/OpenSceneGraph/osganimate-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osganimate</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osganimationviewer-Info.plist

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>osganimationviewer</string>
-	<key>CFBundleGetInfoString</key>
-	<string></string>
-	<key>CFBundleIdentifier</key>
-	<string>org.OpenSceneGraph.osganimationviewer</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleShortVersionString</key>
-	<string></string>
-</dict>
-</plist>

Xcode/OpenSceneGraph/osgarchive-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany. osgarchive</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgautotransform-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgautotransform</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgbillboard-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgbillboard</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgblendequation-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgblendequation</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgcallback-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgcallback</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgcamera-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.osgcamera</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgcameragroup-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgcameragroup</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgcatch-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgcatch</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgclip-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgclip</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgcluster-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgcluster</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgcompositeviewer-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.osgcompositeviewer</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>1.9.7</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgconv-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgconv</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgcopy-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com. OpenSceneGraph.osgcopy</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgcubemap-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.MySoftwareCompany.osgcubemap</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgdb_freetype-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0d1</string>
+	<string>2.0.0d1</string>
 	<key>CSResourcesFileMapped</key>
 	<string>yes</string>
 </dict>

Xcode/OpenSceneGraph/osgdb_freetype2-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0d1</string>
+	<string>2.0.0d1</string>
 	<key>CSResourcesFileMapped</key>
 	<string>yes</string>
 </dict>

Xcode/OpenSceneGraph/osgdb_osgText-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0d1</string>
+	<string>2.0.0d1</string>
 	<key>CSResourcesFileMapped</key>
 	<string>yes</string>
 </dict>

Xcode/OpenSceneGraph/osgdelaunay-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.osgdelaunay</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>

Xcode/OpenSceneGraph/osgdepthpartition-Info.plist

@@ -7,6 +7,6 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.OpenSceneGraph.osgdepthpartition</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.0</string>
+	<string>2.0.0</string>
 </dict>
 </plist>