From 673e74146ed0523b435b4f8e420d26aa12dc4266 Mon Sep 17 00:00:00 2001
From: "erwin.coumans@gmail.com"
 <erwin.coumans@gmail.com@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Sun, 17 Nov 2013 20:03:42 +0000
Subject: [PATCH] only build demos using extras if BUILD_EXTRAS is on

---
 Demos/CMakeLists.txt                | 11 +++++++----
 Demos/GyroscopicDemo/CMakeLists.txt |  6 ++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Demos/CMakeLists.txt b/Demos/CMakeLists.txt
index 769ad5267..268e4bb54 100644
--- a/Demos/CMakeLists.txt
+++ b/Demos/CMakeLists.txt
@@ -9,17 +9,20 @@ SUBDIRS( HelloWorld )
 IF (USE_GLUT)
 	IF (GLUT_FOUND)
 		IF(BUILD_CPU_DEMOS)
+			IF(BUILD_EXTRAS)
+				SUBDIRS(AllBulletDemos BulletXmlImportDemo ConcaveDemo ConstraintDemo ConvexDecompositionDemo SerializeDemo )
+			ENDIF()		
 			SET(SharedDemoSubdirs
-				OpenGL AllBulletDemos  ConvexDecompositionDemo
-				CcdPhysicsDemo BulletXmlImportDemo ConstraintDemo SliderConstraintDemo GenericJointDemo Raytracer
+				OpenGL   
+				CcdPhysicsDemo   SliderConstraintDemo GenericJointDemo Raytracer
 				RagdollDemo ForkLiftDemo BasicDemo FeatherstoneMultiBodyDemo RollingFrictionDemo RaytestDemo VoronoiFractureDemo 
 				GyroscopicDemo FractureDemo Box2dDemo BspDemo MovingConcaveDemo VehicleDemo
 				UserCollisionAlgorithm CharacterDemo SoftDemo 
 				CollisionInterfaceDemo ConcaveConvexcastDemo SimplexDemo DynamicControlDemo
 				ConvexHullDistance
-				DoublePrecisionDemo ConcaveDemo CollisionDemo
+				DoublePrecisionDemo  CollisionDemo
 				ContinuousConvexCollision ConcaveRaycastDemo GjkConvexCastDemo
-				MultiMaterialDemo SerializeDemo InternalEdgeDemo 
+				MultiMaterialDemo InternalEdgeDemo 
 			)
 		ELSE()
 			SET(SharedDemoSubdirs			OpenGL		)
diff --git a/Demos/GyroscopicDemo/CMakeLists.txt b/Demos/GyroscopicDemo/CMakeLists.txt
index 828b9c412..562ff1723 100644
--- a/Demos/GyroscopicDemo/CMakeLists.txt
+++ b/Demos/GyroscopicDemo/CMakeLists.txt
@@ -14,14 +14,12 @@
 INCLUDE_DIRECTORIES(
 ${BULLET_PHYSICS_SOURCE_DIR}/src 
 ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
 )
 
 
 IF (USE_GLUT)
 	LINK_LIBRARIES(
-		OpenGLSupport BulletWorldImporter BulletDynamics  BulletCollision LinearMath  BulletFileLoader  ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+		OpenGLSupport BulletDynamics  BulletCollision LinearMath  ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 	)
 
 	ADD_EXECUTABLE(AppGyroscopicDemo
@@ -50,7 +48,7 @@ IF (USE_GLUT)
 	ENDIF(WIN32)
 ELSE (USE_GLUT)
 	LINK_LIBRARIES(
-		OpenGLSupport BulletWorldImporter BulletDynamics  BulletCollision LinearMath BulletFileLoader ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+		OpenGLSupport BulletDynamics  BulletCollision LinearMath ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 	)
 
 	ADD_EXECUTABLE(AppGyroscopicDemo