diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index be5a2ef08..1d28fb7e2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,28 +1,28 @@
 #the old construct SUBDIRS( was substituded by ADD_SUBDIRECTORY that is to be preferred according on CMake docs.
 FOREACH( mylibfolder 
   OpenThreads
-	osg
-	osgDB 
-	osgUtil 
-	osgGA 
-	osgText 
-	osgManipulator
-	osgSim
-	osgFX
-	osgParticle
-	osgShadow
-	osgTerrain
-	osgViewer
+    osg
+    osgDB 
+    osgUtil 
+    osgGA 
+    osgText 
+    osgManipulator
+    osgSim
+    osgFX
+    osgParticle
+    osgShadow
+    osgTerrain
+    osgViewer
 )
-	ADD_SUBDIRECTORY(${mylibfolder})
-ENDFOREACH( mylibfolder	)
+    ADD_SUBDIRECTORY(${mylibfolder})
+ENDFOREACH( mylibfolder    )
 OPTION(BUILD_OSG_PLUGINS "Enable to build OSG Plugins" ON)
 IF   (BUILD_OSG_PLUGINS)
-	ADD_SUBDIRECTORY(osgPlugins)
+    ADD_SUBDIRECTORY(osgPlugins)
 ENDIF(BUILD_OSG_PLUGINS)
 
 OPTION(BUILD_OSG_WRAPPERS "Enable to build Introspection and Wrappers" OFF)
 IF   (BUILD_OSG_WRAPPERS)
-	ADD_SUBDIRECTORY(osgIntrospection)
-	ADD_SUBDIRECTORY(osgWrappers)
+    ADD_SUBDIRECTORY(osgIntrospection)
+    ADD_SUBDIRECTORY(osgWrappers)
 ENDIF(BUILD_OSG_WRAPPERS)
diff --git a/src/osgDB/CMakeLists.txt b/src/osgDB/CMakeLists.txt
index b533bc694..3ab40eab2 100644
--- a/src/osgDB/CMakeLists.txt
+++ b/src/osgDB/CMakeLists.txt
@@ -1,63 +1,63 @@
 
 IF   (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSGDB_LIBRARY)
+    ADD_DEFINITIONS(-DOSGDB_LIBRARY)
 ELSE (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
+    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
 ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
 SET(LIB_NAME osgDB)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(LIB_PUBLIC_HEADERS
-	${HEADER_PATH}/Archive
-	${HEADER_PATH}/DatabasePager
-	${HEADER_PATH}/DotOsgWrapper
-	${HEADER_PATH}/DynamicLibrary
-	${HEADER_PATH}/Export
-	${HEADER_PATH}/Field
-	${HEADER_PATH}/FieldReader
-	${HEADER_PATH}/FieldReaderIterator
-	${HEADER_PATH}/FileNameUtils
-	${HEADER_PATH}/FileUtils
-	${HEADER_PATH}/ImageOptions
-	${HEADER_PATH}/Input
-	${HEADER_PATH}/Output
-	${HEADER_PATH}/ParameterOutput
-	${HEADER_PATH}/ReaderWriter
-	${HEADER_PATH}/ReadFile
-	${HEADER_PATH}/Registry
-	${HEADER_PATH}/SharedStateManager
-	${HEADER_PATH}/Version
-	${HEADER_PATH}/WriteFile
+    ${HEADER_PATH}/Archive
+    ${HEADER_PATH}/DatabasePager
+    ${HEADER_PATH}/DotOsgWrapper
+    ${HEADER_PATH}/DynamicLibrary
+    ${HEADER_PATH}/Export
+    ${HEADER_PATH}/Field
+    ${HEADER_PATH}/FieldReader
+    ${HEADER_PATH}/FieldReaderIterator
+    ${HEADER_PATH}/FileNameUtils
+    ${HEADER_PATH}/FileUtils
+    ${HEADER_PATH}/ImageOptions
+    ${HEADER_PATH}/Input
+    ${HEADER_PATH}/Output
+    ${HEADER_PATH}/ParameterOutput
+    ${HEADER_PATH}/ReaderWriter
+    ${HEADER_PATH}/ReadFile
+    ${HEADER_PATH}/Registry
+    ${HEADER_PATH}/SharedStateManager
+    ${HEADER_PATH}/Version
+    ${HEADER_PATH}/WriteFile
 )
 
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
-	${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-	${LIB_PUBLIC_HEADERS}
-	Archive.cpp
-	DatabasePager.cpp
-	DotOsgWrapper.cpp
-	DynamicLibrary.cpp
-	Field.cpp
-	FieldReader.cpp
-	FieldReaderIterator.cpp
-	FileNameUtils.cpp
-	FileUtils.cpp
-	ImageOptions.cpp
-	Input.cpp
-	Output.cpp
-	ReadFile.cpp
-	ReaderWriter.cpp
-	Registry.cpp
-	SharedStateManager.cpp
-	Version.cpp
-	WriteFile.cpp
+    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
+    ${LIB_PUBLIC_HEADERS}
+    Archive.cpp
+    DatabasePager.cpp
+    DotOsgWrapper.cpp
+    DynamicLibrary.cpp
+    Field.cpp
+    FieldReader.cpp
+    FieldReaderIterator.cpp
+    FileNameUtils.cpp
+    FileUtils.cpp
+    ImageOptions.cpp
+    Input.cpp
+    Output.cpp
+    ReadFile.cpp
+    ReaderWriter.cpp
+    Registry.cpp
+    SharedStateManager.cpp
+    Version.cpp
+    WriteFile.cpp
 )
 
 IF(APPLE)
-	# Needs CoreFoundation calls and a Carbon function
-	SET(OSGDB_PLATFORM_SPECIFIC_LIBRARIES ${CARBON_LIBRARY})
-	ADD_DEFINITIONS(-DDARWIN_QUICKTIME)
+    # Needs CoreFoundation calls and a Carbon function
+    SET(OSGDB_PLATFORM_SPECIFIC_LIBRARIES ${CARBON_LIBRARY})
+    ADD_DEFINITIONS(-DDARWIN_QUICKTIME)
 ENDIF(APPLE)
 
 IF(XINE_FOUND)
@@ -73,11 +73,11 @@ IF(OPENVRML_FOUND)
 ENDIF(OPENVRML_FOUND)
 
 
-LINK_INTERNAL(${LIB_NAME} 	
-	osg
-	OpenThreads
+LINK_INTERNAL(${LIB_NAME}     
+    osg
+    OpenThreads
 )
-LINK_EXTERNAL(${LIB_NAME} 	${OSGDB_PLATFORM_SPECIFIC_LIBRARIES} )
+LINK_EXTERNAL(${LIB_NAME}     ${OSGDB_PLATFORM_SPECIFIC_LIBRARIES} )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 
 INCLUDE(ModuleInstall OPTIONAL)
diff --git a/src/osgFX/CMakeLists.txt b/src/osgFX/CMakeLists.txt
index 01e15a0ac..cdac7d99d 100644
--- a/src/osgFX/CMakeLists.txt
+++ b/src/osgFX/CMakeLists.txt
@@ -1,47 +1,47 @@
 
 IF   (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSGFX_LIBRARY)
+    ADD_DEFINITIONS(-DOSGFX_LIBRARY)
 ELSE (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
+    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
 ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
 SET(LIB_NAME osgFX)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(LIB_PUBLIC_HEADERS
-	${HEADER_PATH}/AnisotropicLighting
-	${HEADER_PATH}/BumpMapping
-	${HEADER_PATH}/Cartoon
-	${HEADER_PATH}/Effect
-	${HEADER_PATH}/Export
-	${HEADER_PATH}/MultiTextureControl
-	${HEADER_PATH}/Registry
-	${HEADER_PATH}/Scribe
-	${HEADER_PATH}/SpecularHighlights
-	${HEADER_PATH}/Technique
-	${HEADER_PATH}/Validator
+    ${HEADER_PATH}/AnisotropicLighting
+    ${HEADER_PATH}/BumpMapping
+    ${HEADER_PATH}/Cartoon
+    ${HEADER_PATH}/Effect
+    ${HEADER_PATH}/Export
+    ${HEADER_PATH}/MultiTextureControl
+    ${HEADER_PATH}/Registry
+    ${HEADER_PATH}/Scribe
+    ${HEADER_PATH}/SpecularHighlights
+    ${HEADER_PATH}/Technique
+    ${HEADER_PATH}/Validator
 )
 
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
-	${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-	${LIB_PUBLIC_HEADERS}
-	AnisotropicLighting.cpp
-	BumpMapping.cpp
-	Cartoon.cpp
-	Effect.cpp
-	MultiTextureControl.cpp
-	Registry.cpp
-	Scribe.cpp
-	SpecularHighlights.cpp
-	Technique.cpp
-	Validator.cpp
+    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
+    ${LIB_PUBLIC_HEADERS}
+    AnisotropicLighting.cpp
+    BumpMapping.cpp
+    Cartoon.cpp
+    Effect.cpp
+    MultiTextureControl.cpp
+    Registry.cpp
+    Scribe.cpp
+    SpecularHighlights.cpp
+    Technique.cpp
+    Validator.cpp
 )
 
-LINK_INTERNAL(${LIB_NAME} 	
-	osgUtil
-	osgDB
-	osg
-	OpenThreads
+LINK_INTERNAL(${LIB_NAME}     
+    osgUtil
+    osgDB
+    osg
+    OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 
diff --git a/src/osgGA/CMakeLists.txt b/src/osgGA/CMakeLists.txt
index 9e0173cab..ced211cd1 100644
--- a/src/osgGA/CMakeLists.txt
+++ b/src/osgGA/CMakeLists.txt
@@ -1,58 +1,58 @@
 
 IF   (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSGGA_LIBRARY)
+    ADD_DEFINITIONS(-DOSGGA_LIBRARY)
 ELSE (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
+    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
 ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
 SET(LIB_NAME osgGA)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(LIB_PUBLIC_HEADERS
-	${HEADER_PATH}/AnimationPathManipulator
-	${HEADER_PATH}/DriveManipulator
-	${HEADER_PATH}/EventQueue
-	${HEADER_PATH}/EventVisitor
-	${HEADER_PATH}/Export
-	${HEADER_PATH}/FlightManipulator
-	${HEADER_PATH}/GUIActionAdapter
-	${HEADER_PATH}/GUIEventAdapter
-	${HEADER_PATH}/GUIEventHandler
-	${HEADER_PATH}/KeySwitchMatrixManipulator
-	${HEADER_PATH}/MatrixManipulator
-	${HEADER_PATH}/NodeTrackerManipulator
-	${HEADER_PATH}/StateSetManipulator
-	${HEADER_PATH}/TerrainManipulator
-	${HEADER_PATH}/TrackballManipulator
-	${HEADER_PATH}/UFOManipulator
-	${HEADER_PATH}/Version
+    ${HEADER_PATH}/AnimationPathManipulator
+    ${HEADER_PATH}/DriveManipulator
+    ${HEADER_PATH}/EventQueue
+    ${HEADER_PATH}/EventVisitor
+    ${HEADER_PATH}/Export
+    ${HEADER_PATH}/FlightManipulator
+    ${HEADER_PATH}/GUIActionAdapter
+    ${HEADER_PATH}/GUIEventAdapter
+    ${HEADER_PATH}/GUIEventHandler
+    ${HEADER_PATH}/KeySwitchMatrixManipulator
+    ${HEADER_PATH}/MatrixManipulator
+    ${HEADER_PATH}/NodeTrackerManipulator
+    ${HEADER_PATH}/StateSetManipulator
+    ${HEADER_PATH}/TerrainManipulator
+    ${HEADER_PATH}/TrackballManipulator
+    ${HEADER_PATH}/UFOManipulator
+    ${HEADER_PATH}/Version
 )
 
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
-	${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-	${LIB_PUBLIC_HEADERS}
-	AnimationPathManipulator.cpp
-	DriveManipulator.cpp
-	EventQueue.cpp
-	EventVisitor.cpp
-	FlightManipulator.cpp
-	GUIEventAdapter.cpp
-	GUIEventHandler.cpp
-	KeySwitchMatrixManipulator.cpp
-	MatrixManipulator.cpp
-	NodeTrackerManipulator.cpp
-	StateSetManipulator.cpp
-	TerrainManipulator.cpp
-	TrackballManipulator.cpp
-	UFOManipulator.cpp
-	Version.cpp
+    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
+    ${LIB_PUBLIC_HEADERS}
+    AnimationPathManipulator.cpp
+    DriveManipulator.cpp
+    EventQueue.cpp
+    EventVisitor.cpp
+    FlightManipulator.cpp
+    GUIEventAdapter.cpp
+    GUIEventHandler.cpp
+    KeySwitchMatrixManipulator.cpp
+    MatrixManipulator.cpp
+    NodeTrackerManipulator.cpp
+    StateSetManipulator.cpp
+    TerrainManipulator.cpp
+    TrackballManipulator.cpp
+    UFOManipulator.cpp
+    Version.cpp
 )
 
-LINK_INTERNAL(${LIB_NAME} 	
-	osgDB
-	osgUtil
-	osg
-	OpenThreads
+LINK_INTERNAL(${LIB_NAME}     
+    osgDB
+    osgUtil
+    osg
+    OpenThreads
 )
 
 LINK_CORELIB_DEFAULT(${LIB_NAME})
diff --git a/src/osgIntrospection/CMakeLists.txt b/src/osgIntrospection/CMakeLists.txt
index fefa6b544..0eb225f30 100644
--- a/src/osgIntrospection/CMakeLists.txt
+++ b/src/osgIntrospection/CMakeLists.txt
@@ -1,57 +1,57 @@
 
 IF   (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSGINTROSPECTION_LIBRARY)
+    ADD_DEFINITIONS(-DOSGINTROSPECTION_LIBRARY)
 ELSE (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
+    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
 ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
 SET(LIB_NAME osgIntrospection)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(LIB_PUBLIC_HEADERS
-	${HEADER_PATH}/Attributes
-	${HEADER_PATH}/Comparator
-	${HEADER_PATH}/ConstructorInfo
-	${HEADER_PATH}/Converter
-	${HEADER_PATH}/ConverterProxy
-	${HEADER_PATH}/CustomAttribute
-	${HEADER_PATH}/CustomAttributeProvider
-	${HEADER_PATH}/Exceptions
-	${HEADER_PATH}/Export
-	${HEADER_PATH}/ExtendedTypeInfo
-	${HEADER_PATH}/InstanceCreator
-	${HEADER_PATH}/MethodInfo
-	${HEADER_PATH}/ParameterInfo
-	${HEADER_PATH}/PropertyInfo
-	${HEADER_PATH}/PublicMemberAccessor
-	${HEADER_PATH}/ReaderWriter
-	${HEADER_PATH}/Reflection
-	${HEADER_PATH}/ReflectionMacros
-	${HEADER_PATH}/Reflector
-	${HEADER_PATH}/StaticMethodInfo
-	${HEADER_PATH}/Type
-	${HEADER_PATH}/TypedConstructorInfo
-	${HEADER_PATH}/TypedMethodInfo
-	${HEADER_PATH}/TypeNameAliasProxy
-	${HEADER_PATH}/type_traits
-	${HEADER_PATH}/Utility
-	${HEADER_PATH}/Value
-	${HEADER_PATH}/variant_cast
+    ${HEADER_PATH}/Attributes
+    ${HEADER_PATH}/Comparator
+    ${HEADER_PATH}/ConstructorInfo
+    ${HEADER_PATH}/Converter
+    ${HEADER_PATH}/ConverterProxy
+    ${HEADER_PATH}/CustomAttribute
+    ${HEADER_PATH}/CustomAttributeProvider
+    ${HEADER_PATH}/Exceptions
+    ${HEADER_PATH}/Export
+    ${HEADER_PATH}/ExtendedTypeInfo
+    ${HEADER_PATH}/InstanceCreator
+    ${HEADER_PATH}/MethodInfo
+    ${HEADER_PATH}/ParameterInfo
+    ${HEADER_PATH}/PropertyInfo
+    ${HEADER_PATH}/PublicMemberAccessor
+    ${HEADER_PATH}/ReaderWriter
+    ${HEADER_PATH}/Reflection
+    ${HEADER_PATH}/ReflectionMacros
+    ${HEADER_PATH}/Reflector
+    ${HEADER_PATH}/StaticMethodInfo
+    ${HEADER_PATH}/Type
+    ${HEADER_PATH}/TypedConstructorInfo
+    ${HEADER_PATH}/TypedMethodInfo
+    ${HEADER_PATH}/TypeNameAliasProxy
+    ${HEADER_PATH}/type_traits
+    ${HEADER_PATH}/Utility
+    ${HEADER_PATH}/Value
+    ${HEADER_PATH}/variant_cast
 )
 
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
-	${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-	${LIB_PUBLIC_HEADERS}
-	ConstructorInfo.cpp
-	CustomAttributeProvider.cpp
-	DefaultReflectors.cpp
-	MethodInfo.cpp
-	PropertyInfo.cpp
-	Reflection.cpp
-	Reflector.cpp
-	Type.cpp
-	Utility.cpp
-	Value.cpp
+    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
+    ${LIB_PUBLIC_HEADERS}
+    ConstructorInfo.cpp
+    CustomAttributeProvider.cpp
+    DefaultReflectors.cpp
+    MethodInfo.cpp
+    PropertyInfo.cpp
+    Reflection.cpp
+    Reflector.cpp
+    Type.cpp
+    Utility.cpp
+    Value.cpp
 )
 
 LINK_INTERNAL(${LIB_NAME}
diff --git a/src/osgManipulator/CMakeLists.txt b/src/osgManipulator/CMakeLists.txt
index 061dc450f..5a51d87b6 100644
--- a/src/osgManipulator/CMakeLists.txt
+++ b/src/osgManipulator/CMakeLists.txt
@@ -1,67 +1,67 @@
 
 IF   (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSGMANIPULATOR_LIBRARY)
+    ADD_DEFINITIONS(-DOSGMANIPULATOR_LIBRARY)
 ELSE (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
+    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
 ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
 SET(LIB_NAME osgManipulator)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(LIB_PUBLIC_HEADERS
-	${HEADER_PATH}/AntiSquish
-	${HEADER_PATH}/Command
-	${HEADER_PATH}/CommandManager
-	${HEADER_PATH}/Constraint
-	${HEADER_PATH}/Dragger
-	${HEADER_PATH}/Export
-	${HEADER_PATH}/Projector
-	${HEADER_PATH}/RotateCylinderDragger
-	${HEADER_PATH}/RotateSphereDragger
-	${HEADER_PATH}/Scale1DDragger
-	${HEADER_PATH}/Scale2DDragger
-	${HEADER_PATH}/ScaleAxisDragger
-	${HEADER_PATH}/Selection
-	${HEADER_PATH}/TabBoxDragger
-	${HEADER_PATH}/TabPlaneDragger
-	${HEADER_PATH}/TabPlaneTrackballDragger
-	${HEADER_PATH}/TrackballDragger
-	${HEADER_PATH}/Translate1DDragger
-	${HEADER_PATH}/Translate2DDragger
-	${HEADER_PATH}/TranslateAxisDragger
-	${HEADER_PATH}/TranslatePlaneDragger
+    ${HEADER_PATH}/AntiSquish
+    ${HEADER_PATH}/Command
+    ${HEADER_PATH}/CommandManager
+    ${HEADER_PATH}/Constraint
+    ${HEADER_PATH}/Dragger
+    ${HEADER_PATH}/Export
+    ${HEADER_PATH}/Projector
+    ${HEADER_PATH}/RotateCylinderDragger
+    ${HEADER_PATH}/RotateSphereDragger
+    ${HEADER_PATH}/Scale1DDragger
+    ${HEADER_PATH}/Scale2DDragger
+    ${HEADER_PATH}/ScaleAxisDragger
+    ${HEADER_PATH}/Selection
+    ${HEADER_PATH}/TabBoxDragger
+    ${HEADER_PATH}/TabPlaneDragger
+    ${HEADER_PATH}/TabPlaneTrackballDragger
+    ${HEADER_PATH}/TrackballDragger
+    ${HEADER_PATH}/Translate1DDragger
+    ${HEADER_PATH}/Translate2DDragger
+    ${HEADER_PATH}/TranslateAxisDragger
+    ${HEADER_PATH}/TranslatePlaneDragger
 )
 
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
-	${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-	${LIB_PUBLIC_HEADERS}
-	AntiSquish.cpp
-	Command.cpp
-	CommandManager.cpp
-	Constraint.cpp
-	Dragger.cpp
-	Projector.cpp
-	RotateCylinderDragger.cpp
-	RotateSphereDragger.cpp
-	Scale1DDragger.cpp
-	Scale2DDragger.cpp
-	ScaleAxisDragger.cpp
-	Selection.cpp
-	TabBoxDragger.cpp
-	TabPlaneDragger.cpp
-	TabPlaneTrackballDragger.cpp
-	TrackballDragger.cpp
-	Translate1DDragger.cpp
-	Translate2DDragger.cpp
-	TranslateAxisDragger.cpp
-	TranslatePlaneDragger.cpp
+    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
+    ${LIB_PUBLIC_HEADERS}
+    AntiSquish.cpp
+    Command.cpp
+    CommandManager.cpp
+    Constraint.cpp
+    Dragger.cpp
+    Projector.cpp
+    RotateCylinderDragger.cpp
+    RotateSphereDragger.cpp
+    Scale1DDragger.cpp
+    Scale2DDragger.cpp
+    ScaleAxisDragger.cpp
+    Selection.cpp
+    TabBoxDragger.cpp
+    TabPlaneDragger.cpp
+    TabPlaneTrackballDragger.cpp
+    TrackballDragger.cpp
+    Translate1DDragger.cpp
+    Translate2DDragger.cpp
+    TranslateAxisDragger.cpp
+    TranslatePlaneDragger.cpp
 )
 
-LINK_INTERNAL(${LIB_NAME} 	
-	osgGA
-	osgUtil
-	osg
-	OpenThreads
+LINK_INTERNAL(${LIB_NAME}     
+    osgGA
+    osgUtil
+    osg
+    OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 
diff --git a/src/osgParticle/CMakeLists.txt b/src/osgParticle/CMakeLists.txt
index 7ce4199d2..88f8386e2 100644
--- a/src/osgParticle/CMakeLists.txt
+++ b/src/osgParticle/CMakeLists.txt
@@ -1,86 +1,86 @@
 
 IF   (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSGPARTICLE_LIBRARY)
+    ADD_DEFINITIONS(-DOSGPARTICLE_LIBRARY)
 ELSE (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
+    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
 ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
 SET(LIB_NAME osgParticle)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(LIB_PUBLIC_HEADERS
-	${HEADER_PATH}/AccelOperator
-	${HEADER_PATH}/AngularAccelOperator
-	${HEADER_PATH}/BoxPlacer
-	${HEADER_PATH}/CenteredPlacer
-	${HEADER_PATH}/ConnectedParticleSystem
-	${HEADER_PATH}/ConstantRateCounter
-	${HEADER_PATH}/Counter
-	${HEADER_PATH}/Emitter
-	${HEADER_PATH}/ExplosionDebrisEffect
-	${HEADER_PATH}/ExplosionEffect
-	${HEADER_PATH}/Export
-	${HEADER_PATH}/FireEffect
-	${HEADER_PATH}/FluidFrictionOperator
-	${HEADER_PATH}/FluidProgram
-	${HEADER_PATH}/ForceOperator
-	${HEADER_PATH}/Interpolator
-	${HEADER_PATH}/LinearInterpolator
-	${HEADER_PATH}/ModularEmitter
-	${HEADER_PATH}/ModularProgram
-	${HEADER_PATH}/MultiSegmentPlacer
-	${HEADER_PATH}/Operator
-	${HEADER_PATH}/Particle
-	${HEADER_PATH}/ParticleEffect
-	${HEADER_PATH}/ParticleProcessor
-	${HEADER_PATH}/ParticleSystem
-	${HEADER_PATH}/ParticleSystemUpdater
-	${HEADER_PATH}/Placer
-	${HEADER_PATH}/PointPlacer
-	${HEADER_PATH}/PrecipitationEffect
-	${HEADER_PATH}/Program
-	${HEADER_PATH}/RadialShooter
-	${HEADER_PATH}/RandomRateCounter
-	${HEADER_PATH}/range
-	${HEADER_PATH}/SectorPlacer
-	${HEADER_PATH}/SegmentPlacer
-	${HEADER_PATH}/Shooter
-	${HEADER_PATH}/SmokeEffect
-	${HEADER_PATH}/SmokeTrailEffect
-	${HEADER_PATH}/VariableRateCounter
-	${HEADER_PATH}/Version
+    ${HEADER_PATH}/AccelOperator
+    ${HEADER_PATH}/AngularAccelOperator
+    ${HEADER_PATH}/BoxPlacer
+    ${HEADER_PATH}/CenteredPlacer
+    ${HEADER_PATH}/ConnectedParticleSystem
+    ${HEADER_PATH}/ConstantRateCounter
+    ${HEADER_PATH}/Counter
+    ${HEADER_PATH}/Emitter
+    ${HEADER_PATH}/ExplosionDebrisEffect
+    ${HEADER_PATH}/ExplosionEffect
+    ${HEADER_PATH}/Export
+    ${HEADER_PATH}/FireEffect
+    ${HEADER_PATH}/FluidFrictionOperator
+    ${HEADER_PATH}/FluidProgram
+    ${HEADER_PATH}/ForceOperator
+    ${HEADER_PATH}/Interpolator
+    ${HEADER_PATH}/LinearInterpolator
+    ${HEADER_PATH}/ModularEmitter
+    ${HEADER_PATH}/ModularProgram
+    ${HEADER_PATH}/MultiSegmentPlacer
+    ${HEADER_PATH}/Operator
+    ${HEADER_PATH}/Particle
+    ${HEADER_PATH}/ParticleEffect
+    ${HEADER_PATH}/ParticleProcessor
+    ${HEADER_PATH}/ParticleSystem
+    ${HEADER_PATH}/ParticleSystemUpdater
+    ${HEADER_PATH}/Placer
+    ${HEADER_PATH}/PointPlacer
+    ${HEADER_PATH}/PrecipitationEffect
+    ${HEADER_PATH}/Program
+    ${HEADER_PATH}/RadialShooter
+    ${HEADER_PATH}/RandomRateCounter
+    ${HEADER_PATH}/range
+    ${HEADER_PATH}/SectorPlacer
+    ${HEADER_PATH}/SegmentPlacer
+    ${HEADER_PATH}/Shooter
+    ${HEADER_PATH}/SmokeEffect
+    ${HEADER_PATH}/SmokeTrailEffect
+    ${HEADER_PATH}/VariableRateCounter
+    ${HEADER_PATH}/Version
 )
 
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
-	${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-	${LIB_PUBLIC_HEADERS}
-	ConnectedParticleSystem.cpp
-	Emitter.cpp
-	ExplosionDebrisEffect.cpp
-	ExplosionEffect.cpp
-	FireEffect.cpp
-	FluidFrictionOperator.cpp
-	FluidProgram.cpp
-	ModularEmitter.cpp
-	ModularProgram.cpp
-	MultiSegmentPlacer.cpp
-	Particle.cpp
-	ParticleEffect.cpp
-	ParticleProcessor.cpp
-	ParticleSystem.cpp
-	ParticleSystemUpdater.cpp
-	PrecipitationEffect.cpp
-	Program.cpp
-	SmokeEffect.cpp
-	SmokeTrailEffect.cpp
-	Version.cpp
+    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
+    ${LIB_PUBLIC_HEADERS}
+    ConnectedParticleSystem.cpp
+    Emitter.cpp
+    ExplosionDebrisEffect.cpp
+    ExplosionEffect.cpp
+    FireEffect.cpp
+    FluidFrictionOperator.cpp
+    FluidProgram.cpp
+    ModularEmitter.cpp
+    ModularProgram.cpp
+    MultiSegmentPlacer.cpp
+    Particle.cpp
+    ParticleEffect.cpp
+    ParticleProcessor.cpp
+    ParticleSystem.cpp
+    ParticleSystemUpdater.cpp
+    PrecipitationEffect.cpp
+    Program.cpp
+    SmokeEffect.cpp
+    SmokeTrailEffect.cpp
+    Version.cpp
 )
 
-LINK_INTERNAL(${LIB_NAME} 	
-	osgUtil
-	osgDB
-	osg
-	OpenThreads
+LINK_INTERNAL(${LIB_NAME}     
+    osgUtil
+    osgDB
+    osg
+    OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 
diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt
index c96dee516..5f61c9aa9 100644
--- a/src/osgPlugins/CMakeLists.txt
+++ b/src/osgPlugins/CMakeLists.txt
@@ -8,11 +8,11 @@ PROJECT(OSG_PLUGINS_MASTER)
 
 
 IF(NOT MSVC)
-	SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}")
+    SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}")
 ENDIF(NOT MSVC)
 
 IF(NOT MINGW)
-	SET(CMAKE_SHARED_MODULE_PREFIX "")
+    SET(CMAKE_SHARED_MODULE_PREFIX "")
 ENDIF(NOT MINGW)
 
 
@@ -20,9 +20,9 @@ SET(TARGET_DEFAULT_PREFIX "osgdb_")
 SET(TARGET_DEFAULT_LABEL_PREFIX "Plugins")
 SET(TARGET_COMMON_LIBRARIES 
         OpenThreads
-	osg 
-	osgDB 
-	osgUtil
+    osg 
+    osgDB 
+    osgUtil
 )
 
 ############################################################
@@ -63,22 +63,22 @@ ADD_SUBDIRECTORY(tga)
 ADD_SUBDIRECTORY(hdr)
 
 IF(JPEG_FOUND)
-	ADD_SUBDIRECTORY(jpeg)
+    ADD_SUBDIRECTORY(jpeg)
 ENDIF(JPEG_FOUND)
 IF(JASPER_FOUND)
-	ADD_SUBDIRECTORY(jp2) 
+    ADD_SUBDIRECTORY(jp2) 
 ENDIF(JASPER_FOUND)
 IF(GIFLIB_FOUND)
-	ADD_SUBDIRECTORY(gif) 
+    ADD_SUBDIRECTORY(gif) 
 ENDIF(GIFLIB_FOUND)
 IF(PNG_FOUND)
-	ADD_SUBDIRECTORY(png)
+    ADD_SUBDIRECTORY(png)
 ENDIF(PNG_FOUND)
 IF(TIFF_FOUND)
-	ADD_SUBDIRECTORY(tiff)
+    ADD_SUBDIRECTORY(tiff)
 ENDIF(TIFF_FOUND)
 IF(GDAL_FOUND)
-	ADD_SUBDIRECTORY(gdal)
+    ADD_SUBDIRECTORY(gdal)
 ENDIF(GDAL_FOUND)
 
 ############################################################
@@ -89,15 +89,15 @@ ENDIF(GDAL_FOUND)
 ADD_SUBDIRECTORY(3dc)
 
 IF(INVENTOR_FOUND)
-	ADD_SUBDIRECTORY(Inventor)
+    ADD_SUBDIRECTORY(Inventor)
 ENDIF(INVENTOR_FOUND)
 
 IF(OPENVRML_FOUND)
-	ADD_SUBDIRECTORY(vrml)
+    ADD_SUBDIRECTORY(vrml)
 ENDIF(OPENVRML_FOUND)
 
 IF(COLLADA_FOUND)
-	ADD_SUBDIRECTORY(dae)
+    ADD_SUBDIRECTORY(dae)
 ENDIF(COLLADA_FOUND)
 
 ADD_SUBDIRECTORY(lwo)
@@ -148,9 +148,9 @@ ENDIF(ZLIB_FOUND)
 ##########to get all the variables of Cmake
 #GET_CMAKE_PROPERTY(MYVARS VARIABLES)
 #FOREACH(myvar ${MYVARS})
-#	FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/AllVariables.txt
-#		"${myvar} -->${${myvar}}<-\n"
-#	)
+#    FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/AllVariables.txt
+#        "${myvar} -->${${myvar}}<-\n"
+#    )
 #ENDFOREACH(myvar)
 
-	
+    
diff --git a/src/osgPlugins/freetype/CMakeLists.txt b/src/osgPlugins/freetype/CMakeLists.txt
index 3492b0a19..298b34cec 100644
--- a/src/osgPlugins/freetype/CMakeLists.txt
+++ b/src/osgPlugins/freetype/CMakeLists.txt
@@ -1,8 +1,8 @@
 #this file is automatically generated 
 
 
-	IF(WIN32)
-		SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
+    IF(WIN32)
+        SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
   ENDIF(WIN32)
   INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS} )
 
diff --git a/src/osgPlugins/gif/CMakeLists.txt b/src/osgPlugins/gif/CMakeLists.txt
index 70741706b..0423f5a2b 100644
--- a/src/osgPlugins/gif/CMakeLists.txt
+++ b/src/osgPlugins/gif/CMakeLists.txt
@@ -1,7 +1,7 @@
 #this file is automatically generated 
 
 
-	INCLUDE_DIRECTORIES( ${GIFLIB_INCLUDE_DIR} )
+    INCLUDE_DIRECTORIES( ${GIFLIB_INCLUDE_DIR} )
 
 
 SET(TARGET_SRC ReaderWriterGIF.cpp )
@@ -10,6 +10,6 @@ SET(TARGET_LIBRARIES_VARS GIFLIB_LIBRARY )
 SETUP_PLUGIN(gif)
 
 IF(MSVC)
-	SET_TARGET_PROPERTIES("${TARGET_DEFAULT_PREFIX}${TARGET_NAME}" PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT")
+    SET_TARGET_PROPERTIES("${TARGET_DEFAULT_PREFIX}${TARGET_NAME}" PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT")
 ENDIF(MSVC)
 
diff --git a/src/osgPlugins/jpeg/CMakeLists.txt b/src/osgPlugins/jpeg/CMakeLists.txt
index dba3be847..14cbdf64b 100644
--- a/src/osgPlugins/jpeg/CMakeLists.txt
+++ b/src/osgPlugins/jpeg/CMakeLists.txt
@@ -1,7 +1,7 @@
 #this file is automatically generated 
 
 
-	INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIR} )
+    INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIR} )
 
 
 SET(TARGET_SRC ReaderWriterJPEG.cpp )
diff --git a/src/osgPlugins/png/CMakeLists.txt b/src/osgPlugins/png/CMakeLists.txt
index fbb5c360a..bfb9fe916 100644
--- a/src/osgPlugins/png/CMakeLists.txt
+++ b/src/osgPlugins/png/CMakeLists.txt
@@ -10,6 +10,6 @@ SET(TARGET_LIBRARIES_VARS PNG_LIBRARY ZLIB_LIBRARY )
 SETUP_PLUGIN(png)
 
 IF(MSVC)
-	SET_TARGET_PROPERTIES("${TARGET_DEFAULT_PREFIX}${TARGET_NAME}" PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT")
+    SET_TARGET_PROPERTIES("${TARGET_DEFAULT_PREFIX}${TARGET_NAME}" PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT")
 ENDIF(MSVC)
 
diff --git a/src/osgPlugins/quicktime/CMakeLists.txt b/src/osgPlugins/quicktime/CMakeLists.txt
index 2a1a8c24b..a60fc0fb5 100644
--- a/src/osgPlugins/quicktime/CMakeLists.txt
+++ b/src/osgPlugins/quicktime/CMakeLists.txt
@@ -1,23 +1,23 @@
 IF(WIN32)
-	SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
+    SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
 ENDIF(WIN32)
 
 INCLUDE_DIRECTORIES(${QUICKTIME_INCLUDE_DIR})
 
 
 SET(TARGET_SRC
-	MovieData.cpp
-	QTUtils.cpp
-	QTtexture.cpp
-	QuicktimeImageStream.cpp
-	ReaderWriterQT.cpp
+    MovieData.cpp
+    QTUtils.cpp
+    QTtexture.cpp
+    QuicktimeImageStream.cpp
+    ReaderWriterQT.cpp
 )
 
 SET(TARGET_H 
-	MovieData.h
-	QTUtils.h
-	QTtexture.h
-	QuicktimeImageStream.h
+    MovieData.h
+    QTUtils.h
+    QTtexture.h
+    QuicktimeImageStream.h
 )
 
 SET(TARGET_ADDED_LIBRARIES)
diff --git a/src/osgSim/CMakeLists.txt b/src/osgSim/CMakeLists.txt
index 997a7e99f..9119d75a2 100644
--- a/src/osgSim/CMakeLists.txt
+++ b/src/osgSim/CMakeLists.txt
@@ -1,74 +1,74 @@
 
 IF   (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSGSIM_LIBRARY)
+    ADD_DEFINITIONS(-DOSGSIM_LIBRARY)
 ELSE (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
+    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
 ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
 SET(LIB_NAME osgSim)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(LIB_PUBLIC_HEADERS
-	${HEADER_PATH}/BlinkSequence
-	${HEADER_PATH}/ColorRange
-	${HEADER_PATH}/DOFTransform
-	${HEADER_PATH}/ElevationSlice
-	${HEADER_PATH}/HeightAboveTerrain
-	${HEADER_PATH}/Export
-	${HEADER_PATH}/GeographicLocation
-	${HEADER_PATH}/Impostor
-	${HEADER_PATH}/ImpostorSprite
-	${HEADER_PATH}/InsertImpostorsVisitor
-	${HEADER_PATH}/LightPoint
-	${HEADER_PATH}/LightPointNode
-	${HEADER_PATH}/LightPointSystem
-	${HEADER_PATH}/LineOfSight
-	${HEADER_PATH}/MultiSwitch
-	${HEADER_PATH}/OpenFlightOptimizer
-	${HEADER_PATH}/OverlayNode
-	${HEADER_PATH}/ScalarBar
-	${HEADER_PATH}/ScalarsToColors
-	${HEADER_PATH}/Sector
-	${HEADER_PATH}/SphereSegment
-	${HEADER_PATH}/Version
-	${HEADER_PATH}/VisibilityGroup
+    ${HEADER_PATH}/BlinkSequence
+    ${HEADER_PATH}/ColorRange
+    ${HEADER_PATH}/DOFTransform
+    ${HEADER_PATH}/ElevationSlice
+    ${HEADER_PATH}/HeightAboveTerrain
+    ${HEADER_PATH}/Export
+    ${HEADER_PATH}/GeographicLocation
+    ${HEADER_PATH}/Impostor
+    ${HEADER_PATH}/ImpostorSprite
+    ${HEADER_PATH}/InsertImpostorsVisitor
+    ${HEADER_PATH}/LightPoint
+    ${HEADER_PATH}/LightPointNode
+    ${HEADER_PATH}/LightPointSystem
+    ${HEADER_PATH}/LineOfSight
+    ${HEADER_PATH}/MultiSwitch
+    ${HEADER_PATH}/OpenFlightOptimizer
+    ${HEADER_PATH}/OverlayNode
+    ${HEADER_PATH}/ScalarBar
+    ${HEADER_PATH}/ScalarsToColors
+    ${HEADER_PATH}/Sector
+    ${HEADER_PATH}/SphereSegment
+    ${HEADER_PATH}/Version
+    ${HEADER_PATH}/VisibilityGroup
 )
 
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
-	${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-	${LIB_PUBLIC_HEADERS}
-	BlinkSequence.cpp
-	ColorRange.cpp
-	DOFTransform.cpp
-	ElevationSlice.cpp
-	HeightAboveTerrain.cpp
-	Impostor.cpp
-	ImpostorSprite.cpp
-	InsertImpostorsVisitor.cpp
-	LightPoint.cpp
-	LightPointDrawable.cpp
-	LightPointDrawable.h
-	LightPointNode.cpp
-	LightPointSpriteDrawable.cpp
-	LightPointSpriteDrawable.h
-	LineOfSight.cpp
-	MultiSwitch.cpp
-	OpenFlightOptimizer.cpp
-	OverlayNode.cpp
-	ScalarBar.cpp
-	ScalarsToColors.cpp
-	Sector.cpp
-	SphereSegment.cpp
-	Version.cpp
-	VisibilityGroup.cpp
+    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
+    ${LIB_PUBLIC_HEADERS}
+    BlinkSequence.cpp
+    ColorRange.cpp
+    DOFTransform.cpp
+    ElevationSlice.cpp
+    HeightAboveTerrain.cpp
+    Impostor.cpp
+    ImpostorSprite.cpp
+    InsertImpostorsVisitor.cpp
+    LightPoint.cpp
+    LightPointDrawable.cpp
+    LightPointDrawable.h
+    LightPointNode.cpp
+    LightPointSpriteDrawable.cpp
+    LightPointSpriteDrawable.h
+    LineOfSight.cpp
+    MultiSwitch.cpp
+    OpenFlightOptimizer.cpp
+    OverlayNode.cpp
+    ScalarBar.cpp
+    ScalarsToColors.cpp
+    Sector.cpp
+    SphereSegment.cpp
+    Version.cpp
+    VisibilityGroup.cpp
 )
 
-LINK_INTERNAL(${LIB_NAME} 	
-	osgText
-	osgUtil
-	osgDB
-	osg
-	OpenThreads
+LINK_INTERNAL(${LIB_NAME}     
+    osgText
+    osgUtil
+    osgDB
+    osg
+    OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 
diff --git a/src/osgTerrain/CMakeLists.txt b/src/osgTerrain/CMakeLists.txt
index 21f4becfd..95f7b850b 100644
--- a/src/osgTerrain/CMakeLists.txt
+++ b/src/osgTerrain/CMakeLists.txt
@@ -1,41 +1,41 @@
 IF   (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSGTERRAIN_LIBRARY)
+    ADD_DEFINITIONS(-DOSGTERRAIN_LIBRARY)
 ELSE (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
+    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
 ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
 SET(LIB_NAME osgTerrain)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(LIB_PUBLIC_HEADERS
-	${HEADER_PATH}/Export
-	${HEADER_PATH}/Locator
-	${HEADER_PATH}/Layer
-	${HEADER_PATH}/Terrain
-	${HEADER_PATH}/TerrainTechnique
-	${HEADER_PATH}/TileSystem
-	${HEADER_PATH}/GeometryTechnique
-	${HEADER_PATH}/ValidDataOperator
-	${HEADER_PATH}/Version
+    ${HEADER_PATH}/Export
+    ${HEADER_PATH}/Locator
+    ${HEADER_PATH}/Layer
+    ${HEADER_PATH}/Terrain
+    ${HEADER_PATH}/TerrainTechnique
+    ${HEADER_PATH}/TileSystem
+    ${HEADER_PATH}/GeometryTechnique
+    ${HEADER_PATH}/ValidDataOperator
+    ${HEADER_PATH}/Version
 )
 
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
-	${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-	${LIB_PUBLIC_HEADERS}
-	Layer.cpp
-	Locator.cpp
-	Terrain.cpp
-	TerrainTechnique.cpp
-	TileSystem.cpp
-	GeometryTechnique.cpp
-	Version.cpp
+    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
+    ${LIB_PUBLIC_HEADERS}
+    Layer.cpp
+    Locator.cpp
+    Terrain.cpp
+    TerrainTechnique.cpp
+    TileSystem.cpp
+    GeometryTechnique.cpp
+    Version.cpp
 )
 
-LINK_INTERNAL(${LIB_NAME} 	
-	osgUtil
-	osgDB
-	osg
-	OpenThreads
+LINK_INTERNAL(${LIB_NAME}     
+    osgUtil
+    osgDB
+    osg
+    OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 
diff --git a/src/osgText/CMakeLists.txt b/src/osgText/CMakeLists.txt
index cb456d1f7..31934943b 100644
--- a/src/osgText/CMakeLists.txt
+++ b/src/osgText/CMakeLists.txt
@@ -1,38 +1,38 @@
 
 IF   (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSGTEXT_LIBRARY)
+    ADD_DEFINITIONS(-DOSGTEXT_LIBRARY)
 ELSE (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
+    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
 ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
 SET(LIB_NAME osgText)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(LIB_PUBLIC_HEADERS
-	${HEADER_PATH}/Export
-	${HEADER_PATH}/Font
-	${HEADER_PATH}/String
-	${HEADER_PATH}/Text
-	${HEADER_PATH}/FadeText
-	${HEADER_PATH}/Version
+    ${HEADER_PATH}/Export
+    ${HEADER_PATH}/Font
+    ${HEADER_PATH}/String
+    ${HEADER_PATH}/Text
+    ${HEADER_PATH}/FadeText
+    ${HEADER_PATH}/Version
 )
 
 # FIXME: For OS X, need flag for Framework or dylib
 ADD_LIBRARY(${LIB_NAME}
-	${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-	${LIB_PUBLIC_HEADERS}
-	DefaultFont.cpp
-	DefaultFont.h
-	Font.cpp
-	String.cpp
-	FadeText.cpp
-	Text.cpp
-	Version.cpp
+    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
+    ${LIB_PUBLIC_HEADERS}
+    DefaultFont.cpp
+    DefaultFont.h
+    Font.cpp
+    String.cpp
+    FadeText.cpp
+    Text.cpp
+    Version.cpp
 )
 
-LINK_INTERNAL(${LIB_NAME} 	
-	osgDB
-	osg
-	OpenThreads
+LINK_INTERNAL(${LIB_NAME}     
+    osgDB
+    osg
+    OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 
diff --git a/src/osgUtil/CMakeLists.txt b/src/osgUtil/CMakeLists.txt
index a61425328..6e7d9acda 100644
--- a/src/osgUtil/CMakeLists.txt
+++ b/src/osgUtil/CMakeLists.txt
@@ -1,88 +1,88 @@
 
 # FIXME: For OS X, need flag for Framework or dylib
 IF   (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSGUTIL_LIBRARY)
+    ADD_DEFINITIONS(-DOSGUTIL_LIBRARY)
 ELSE (DYNAMIC_OPENSCENEGRAPH)
-	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
+    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
 ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
 SET(LIB_NAME osgUtil)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(LIB_PUBLIC_HEADERS
-	${HEADER_PATH}/CubeMapGenerator
-	${HEADER_PATH}/CullVisitor
-	${HEADER_PATH}/DelaunayTriangulator
-	${HEADER_PATH}/DisplayRequirementsVisitor
-	${HEADER_PATH}/Export
-	${HEADER_PATH}/GLObjectsVisitor
-	${HEADER_PATH}/HalfWayMapGenerator
-	${HEADER_PATH}/HighlightMapGenerator
-	${HEADER_PATH}/IntersectVisitor
-	${HEADER_PATH}/IntersectionVisitor
-	${HEADER_PATH}/LineSegmentIntersector
-	${HEADER_PATH}/Optimizer
-	${HEADER_PATH}/PlaneIntersector
-	${HEADER_PATH}/PolytopeIntersector
-	${HEADER_PATH}/PositionalStateContainer
-	${HEADER_PATH}/ReflectionMapGenerator
-	${HEADER_PATH}/RenderBin
-	${HEADER_PATH}/RenderLeaf
-	${HEADER_PATH}/RenderStage
-	${HEADER_PATH}/SceneView
-	${HEADER_PATH}/Simplifier
-	${HEADER_PATH}/SmoothingVisitor
-	${HEADER_PATH}/StateGraph
-	${HEADER_PATH}/Statistics
-	${HEADER_PATH}/TangentSpaceGenerator
-	${HEADER_PATH}/Tessellator
-	${HEADER_PATH}/TransformAttributeFunctor
-	${HEADER_PATH}/TransformCallback
-	${HEADER_PATH}/TriStripVisitor
-	${HEADER_PATH}/UpdateVisitor
-	${HEADER_PATH}/Version
+    ${HEADER_PATH}/CubeMapGenerator
+    ${HEADER_PATH}/CullVisitor
+    ${HEADER_PATH}/DelaunayTriangulator
+    ${HEADER_PATH}/DisplayRequirementsVisitor
+    ${HEADER_PATH}/Export
+    ${HEADER_PATH}/GLObjectsVisitor
+    ${HEADER_PATH}/HalfWayMapGenerator
+    ${HEADER_PATH}/HighlightMapGenerator
+    ${HEADER_PATH}/IntersectVisitor
+    ${HEADER_PATH}/IntersectionVisitor
+    ${HEADER_PATH}/LineSegmentIntersector
+    ${HEADER_PATH}/Optimizer
+    ${HEADER_PATH}/PlaneIntersector
+    ${HEADER_PATH}/PolytopeIntersector
+    ${HEADER_PATH}/PositionalStateContainer
+    ${HEADER_PATH}/ReflectionMapGenerator
+    ${HEADER_PATH}/RenderBin
+    ${HEADER_PATH}/RenderLeaf
+    ${HEADER_PATH}/RenderStage
+    ${HEADER_PATH}/SceneView
+    ${HEADER_PATH}/Simplifier
+    ${HEADER_PATH}/SmoothingVisitor
+    ${HEADER_PATH}/StateGraph
+    ${HEADER_PATH}/Statistics
+    ${HEADER_PATH}/TangentSpaceGenerator
+    ${HEADER_PATH}/Tessellator
+    ${HEADER_PATH}/TransformAttributeFunctor
+    ${HEADER_PATH}/TransformCallback
+    ${HEADER_PATH}/TriStripVisitor
+    ${HEADER_PATH}/UpdateVisitor
+    ${HEADER_PATH}/Version
 )
 
 ADD_LIBRARY(${LIB_NAME}
-	${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
-	${LIB_PUBLIC_HEADERS}
-	CubeMapGenerator.cpp
-	CullVisitor.cpp
-	DelaunayTriangulator.cpp
-	DisplayRequirementsVisitor.cpp
-	GLObjectsVisitor.cpp
-	HalfWayMapGenerator.cpp
-	HighlightMapGenerator.cpp
-	IntersectVisitor.cpp
-	IntersectionVisitor.cpp
-	LineSegmentIntersector.cpp
-	Optimizer.cpp
-	PlaneIntersector.cpp
-	PolytopeIntersector.cpp
-	PositionalStateContainer.cpp
-	RenderBin.cpp
-	RenderLeaf.cpp
-	RenderStage.cpp
-	SceneView.cpp
-	Simplifier.cpp
-	SmoothingVisitor.cpp
-	StateGraph.cpp
-	Statistics.cpp
-	TangentSpaceGenerator.cpp
-	Tessellator.cpp
-	TransformAttributeFunctor.cpp
-	TransformCallback.cpp
-	TriStripVisitor.cpp
-	TriStrip_graph_array.h
-	TriStrip_heap_array.h
-	TriStrip_tri_stripper.cpp
-	TriStrip_tri_stripper.h
-	UpdateVisitor.cpp
-	Version.cpp
+    ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC}
+    ${LIB_PUBLIC_HEADERS}
+    CubeMapGenerator.cpp
+    CullVisitor.cpp
+    DelaunayTriangulator.cpp
+    DisplayRequirementsVisitor.cpp
+    GLObjectsVisitor.cpp
+    HalfWayMapGenerator.cpp
+    HighlightMapGenerator.cpp
+    IntersectVisitor.cpp
+    IntersectionVisitor.cpp
+    LineSegmentIntersector.cpp
+    Optimizer.cpp
+    PlaneIntersector.cpp
+    PolytopeIntersector.cpp
+    PositionalStateContainer.cpp
+    RenderBin.cpp
+    RenderLeaf.cpp
+    RenderStage.cpp
+    SceneView.cpp
+    Simplifier.cpp
+    SmoothingVisitor.cpp
+    StateGraph.cpp
+    Statistics.cpp
+    TangentSpaceGenerator.cpp
+    Tessellator.cpp
+    TransformAttributeFunctor.cpp
+    TransformCallback.cpp
+    TriStripVisitor.cpp
+    TriStrip_graph_array.h
+    TriStrip_heap_array.h
+    TriStrip_tri_stripper.cpp
+    TriStrip_tri_stripper.h
+    UpdateVisitor.cpp
+    Version.cpp
 )
 
-LINK_INTERNAL(${LIB_NAME} 	
-	osg
-	OpenThreads
+LINK_INTERNAL(${LIB_NAME}     
+    osg
+    OpenThreads
 )
 LINK_CORELIB_DEFAULT(${LIB_NAME})
 
diff --git a/src/osgWrappers/CMakeLists.txt b/src/osgWrappers/CMakeLists.txt
index 404bbef28..87f9dbb66 100644
--- a/src/osgWrappers/CMakeLists.txt
+++ b/src/osgWrappers/CMakeLists.txt
@@ -3,135 +3,135 @@ PROJECT(OSG_WRAPPERS)
 SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}")
 
 IF(NOT MINGW)
-	SET(CMAKE_SHARED_MODULE_PREFIX "")
+    SET(CMAKE_SHARED_MODULE_PREFIX "")
 ENDIF(NOT MINGW)
 
 
 MACRO(ADD_WRAPPER_LIB SUBDIR EXPORTDEF)
-	SET(TARGET_NAME "osgwrapper_${SUBDIR}")
-#	MESSAGE(STATUS "--inizio-->${TARGET_NAME}<->${LINK}<-")
+    SET(TARGET_NAME "osgwrapper_${SUBDIR}")
+#    MESSAGE(STATUS "--inizio-->${TARGET_NAME}<->${LINK}<-")
 
-	FILE(GLOB SRC_FILES ${OSGWRAPPER_DIR}/${SUBDIR}/*.cpp)
-	
-	#-- extract link files, defines, exclude files form additional arguments 
+    FILE(GLOB SRC_FILES ${OSGWRAPPER_DIR}/${SUBDIR}/*.cpp)
+    
+    #-- extract link files, defines, exclude files form additional arguments 
 
-	SET(LISTNAME "TEMP")
-	SET(DEFSTR "")
+    SET(LISTNAME "TEMP")
+    SET(DEFSTR "")
 
-	FOREACH(ARG ${ARGN})					# parse remaining args 
-		#MESSAGE(STATUS "+ [${ARG}]")
-		#MESSAGE("ARG-->${ARG}")
-		# if we find our keywords set the active list to given keyname 
-		STRING(COMPARE EQUAL "${ARG}" "LINK" IS_LINK)
-		STRING(COMPARE EQUAL "${ARG}" "DEFINE" IS_DEFINE)
-		STRING(COMPARE EQUAL "${ARG}" "EXCLUDE" IS_EXCLUDE)
-		
-		#MESSAGE(STATUS "STRSTUFF L ${IS_LINK} D ${IS_DEFINE} E ${IS_EXCLUDE}")
-		
-		SET(EXPRESSION ${IS_LINK} OR ${IS_DEFINE} OR ${IS_EXCLUDE})
-		IF(${EXPRESSION})
-			SET(${LISTNAME} ${CURRLIST})
-			# MESSAGE(STATUS "STORED LIST [${LISTNAME}] = (${CURRLIST})")
-			SET(LISTNAME ${ARG})
-			REMOVE(CURRLIST ${CURRLIST} )
-			
-		ELSE(${EXPRESSION})
-			SET(CURRLIST ${CURRLIST} ${ARG})	
-			
-		ENDIF(${EXPRESSION})
-	ENDFOREACH(ARG)
-	SET(${LISTNAME} ${CURRLIST})
-	#MESSAGE(STATUS "STORED LIST [${LISTNAME}] = (${CURRLIST})")
-	REMOVE(CURRLIST ${CURRLIST} )
-	
-	#MESSAGE(STATUS "AFTER: EXC (${EXCLUDE}) DEF (${DEFINE}) LINK (${LINK})")
-	FOREACH(EXF ${EXCLUDE})
-		REMOVE(SRC_FILES ${OPENSCENEGRAPH_DIR}/src/${SUBDIR}/${EXF})
-	ENDFOREACH(EXF)
-		
-	FOREACH(DEF ${DEFINE})
-		SET(DEFSTR "${DEFSTR} /D \"${DEF}\"")
-		#MESSAGE(STATUS "add symbol : " ${DEF})
-	ENDFOREACH(DEF)
-	
-	IF(NOT DEFSTR STREQUAL "")
-		SET_SOURCE_FILES_PROPERTIES(${SRC_FILES} PROPERTIES COMPILE_FLAGS ${DEFSTR})
-		#MESSAGE(STATUS "*********  ADD COMPILE FLAGS ${DEFSTR} **********")
-	ENDIF(NOT DEFSTR STREQUAL "")
-	
-	#ADD_LIBRARY(${TARGET_NAME} SHARED ${SRC_FILES} )
+    FOREACH(ARG ${ARGN})                    # parse remaining args 
+        #MESSAGE(STATUS "+ [${ARG}]")
+        #MESSAGE("ARG-->${ARG}")
+        # if we find our keywords set the active list to given keyname 
+        STRING(COMPARE EQUAL "${ARG}" "LINK" IS_LINK)
+        STRING(COMPARE EQUAL "${ARG}" "DEFINE" IS_DEFINE)
+        STRING(COMPARE EQUAL "${ARG}" "EXCLUDE" IS_EXCLUDE)
+        
+        #MESSAGE(STATUS "STRSTUFF L ${IS_LINK} D ${IS_DEFINE} E ${IS_EXCLUDE}")
+        
+        SET(EXPRESSION ${IS_LINK} OR ${IS_DEFINE} OR ${IS_EXCLUDE})
+        IF(${EXPRESSION})
+            SET(${LISTNAME} ${CURRLIST})
+            # MESSAGE(STATUS "STORED LIST [${LISTNAME}] = (${CURRLIST})")
+            SET(LISTNAME ${ARG})
+            REMOVE(CURRLIST ${CURRLIST} )
+            
+        ELSE(${EXPRESSION})
+            SET(CURRLIST ${CURRLIST} ${ARG})    
+            
+        ENDIF(${EXPRESSION})
+    ENDFOREACH(ARG)
+    SET(${LISTNAME} ${CURRLIST})
+    #MESSAGE(STATUS "STORED LIST [${LISTNAME}] = (${CURRLIST})")
+    REMOVE(CURRLIST ${CURRLIST} )
+    
+    #MESSAGE(STATUS "AFTER: EXC (${EXCLUDE}) DEF (${DEFINE}) LINK (${LINK})")
+    FOREACH(EXF ${EXCLUDE})
+        REMOVE(SRC_FILES ${OPENSCENEGRAPH_DIR}/src/${SUBDIR}/${EXF})
+    ENDFOREACH(EXF)
+        
+    FOREACH(DEF ${DEFINE})
+        SET(DEFSTR "${DEFSTR} /D \"${DEF}\"")
+        #MESSAGE(STATUS "add symbol : " ${DEF})
+    ENDFOREACH(DEF)
+    
+    IF(NOT DEFSTR STREQUAL "")
+        SET_SOURCE_FILES_PROPERTIES(${SRC_FILES} PROPERTIES COMPILE_FLAGS ${DEFSTR})
+        #MESSAGE(STATUS "*********  ADD COMPILE FLAGS ${DEFSTR} **********")
+    ENDIF(NOT DEFSTR STREQUAL "")
+    
+    #ADD_LIBRARY(${TARGET_NAME} SHARED ${SRC_FILES} )
         ADD_LIBRARY(${TARGET_NAME} MODULE ${SRC_FILES} )
         
-	#not sure if needed, but for plugins only msvc need the d suffix
-	IF(NOT MSVC)
-		SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES DEBUG_POSTFIX "")
+    #not sure if needed, but for plugins only msvc need the d suffix
+    IF(NOT MSVC)
+        SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES DEBUG_POSTFIX "")
   ELSE(NOT MSVC)
-    	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_NAME} PROPERTIES PREFIX "../../bin/${OSG_PLUGINS}/")
-	 			SET_TARGET_PROPERTIES(${TARGET_NAME} 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_NAME} PROPERTIES PREFIX "${OSG_PLUGINS}/")
-    	ENDIF(OSG_MSVC_VERSIONED_DLL)
-	ENDIF(NOT MSVC)
+        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_NAME} PROPERTIES PREFIX "../../bin/${OSG_PLUGINS}/")
+                 SET_TARGET_PROPERTIES(${TARGET_NAME} 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_NAME} PROPERTIES PREFIX "${OSG_PLUGINS}/")
+        ENDIF(OSG_MSVC_VERSIONED_DLL)
+    ENDIF(NOT MSVC)
 
-	SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES DEFINE_SYMBOL "${EXPORTDEF}" PROJECT_LABEL "Wrapper ${SUBDIR}")
-	IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
-		LINK_INTERNAL(${TARGET_NAME} ${LINK})
-		#when using full path name to specify linkage, it seems that already linked libs must be specified
-		LINK_EXTERNAL(${TARGET_NAME} ${OPENGL_LIBRARIES}) 
+    SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES DEFINE_SYMBOL "${EXPORTDEF}" PROJECT_LABEL "Wrapper ${SUBDIR}")
+    IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
+        LINK_INTERNAL(${TARGET_NAME} ${LINK})
+        #when using full path name to specify linkage, it seems that already linked libs must be specified
+        LINK_EXTERNAL(${TARGET_NAME} ${OPENGL_LIBRARIES}) 
 
-	ELSE(MSVC AND OSG_MSVC_VERSIONED_DLL)
-		TARGET_LINK_LIBRARIES(${TARGET_NAME} ${LINK})
-	ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
-	#MESSAGE(STATUS "--TARGET_LINK_LIBRARIES-->${TARGET_NAME}<->${LINK}<-")
-	
-	REMOVE(DEFINE ${DEFINE})	
-	REMOVE(LINK ${LINK})	
-	REMOVE(EXCLUDE ${EXCLUDE})	
-	
-	IF(WIN32)
-		INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib/${OSG_PLUGINS} LIBRARY DESTINATION bin/${OSG_PLUGINS} )
-	ELSE(WIN32)
-		INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} )
-	ENDIF(WIN32)
-	
+    ELSE(MSVC AND OSG_MSVC_VERSIONED_DLL)
+        TARGET_LINK_LIBRARIES(${TARGET_NAME} ${LINK})
+    ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
+    #MESSAGE(STATUS "--TARGET_LINK_LIBRARIES-->${TARGET_NAME}<->${LINK}<-")
+    
+    REMOVE(DEFINE ${DEFINE})    
+    REMOVE(LINK ${LINK})    
+    REMOVE(EXCLUDE ${EXCLUDE})    
+    
+    IF(WIN32)
+        INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib/${OSG_PLUGINS} LIBRARY DESTINATION bin/${OSG_PLUGINS} )
+    ELSE(WIN32)
+        INSTALL(TARGETS ${TARGET_NAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} )
+    ENDIF(WIN32)
+    
 ENDMACRO(ADD_WRAPPER_LIB)
 
 
 
 SET(OSGWRAPPER_LIB_LIST 
-	OpenThreads
-	osg
-	osgDB
-	osgUtil
-	osgGA
-	osgText
-	osgParticle
-	osgFX
-	osgSim
-	osgManipulator
-	osgShadow
-	osgTerrain
-	osgViewer
+    OpenThreads
+    osg
+    osgDB
+    osgUtil
+    osgGA
+    osgText
+    osgParticle
+    osgFX
+    osgSim
+    osgManipulator
+    osgShadow
+    osgTerrain
+    osgViewer
 )
 
 
 SET(OSGWRAPPER_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 IF(MSVC)
-	SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
+    SET(LIBRARY_OUTPUT_PATH ${OUTPUT_LIBDIR})
 ENDIF(MSVC)
 FOREACH(LIB ${OSGWRAPPER_LIB_LIST} )
-	ADD_WRAPPER_LIB(${LIB}  OSGWRAPPERS_LIBRARY LINK OpenThreads osg osgGA ${LIB} osgIntrospection)	
+    ADD_WRAPPER_LIB(${LIB}  OSGWRAPPERS_LIBRARY LINK OpenThreads osg osgGA ${LIB} osgIntrospection)    
 ENDFOREACH(LIB ${OSGWRAPPER_LIB_LIST} )