From dcf007ca38ad207c90960f2551feb09ef832aa90 Mon Sep 17 00:00:00 2001
From: ejcoumans <ejcoumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Sat, 30 Sep 2006 02:51:35 +0000
Subject: [PATCH] more refactoring for CMake buildsystem

---
 Demos/BspDemo/CMakeLists.txt                | 4 ++--
 Demos/CcdPhysicsDemo/CMakeLists.txt         | 1 -
 Demos/ColladaDemo/CMakeLists.txt            | 4 ++--
 Demos/OpenGL/CMakeLists.txt                 | 2 +-
 Demos/UserCollisionAlgorithm/CMakeLists.txt | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Demos/BspDemo/CMakeLists.txt b/Demos/BspDemo/CMakeLists.txt
index 7b35903c1..7402bbb6a 100644
--- a/Demos/BspDemo/CMakeLists.txt
+++ b/Demos/BspDemo/CMakeLists.txt
@@ -48,11 +48,11 @@ ELSE (WIN32)
 ENDIF (WIN32)
 
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL  }
 )
 
 LINK_LIBRARIES(
-LibCcdPhysicsInterface LibOpenGLSupport LibBulletDynamics LibPhysicsCommonInterface LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
+ LibOpenGLSupport LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
 )
 
 ADD_EXECUTABLE(BspPhysicsDemo
diff --git a/Demos/CcdPhysicsDemo/CMakeLists.txt b/Demos/CcdPhysicsDemo/CMakeLists.txt
index 3d38de35b..84c56fdb1 100644
--- a/Demos/CcdPhysicsDemo/CMakeLists.txt
+++ b/Demos/CcdPhysicsDemo/CMakeLists.txt
@@ -57,6 +57,5 @@ LibOpenGLSupport  LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_
 
 ADD_EXECUTABLE(CcdPhysicsDemo
 	CcdPhysicsDemo.cpp
-	MyMotionState.cpp
 )
 
diff --git a/Demos/ColladaDemo/CMakeLists.txt b/Demos/ColladaDemo/CMakeLists.txt
index 394ee6bfb..e60c5f3f0 100644
--- a/Demos/ColladaDemo/CMakeLists.txt
+++ b/Demos/ColladaDemo/CMakeLists.txt
@@ -48,11 +48,11 @@ ELSE (WIN32)
 ENDIF (WIN32)
 
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics }
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
 )
 
 LINK_LIBRARIES(
-LibColladaDom LibXML LibCcdPhysicsInterface LibOpenGLSupport LibBulletDynamics LibPhysicsCommonInterface LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
+LibColladaDom LibXML LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
 )
 
 ADD_EXECUTABLE(ColladaDemo
diff --git a/Demos/OpenGL/CMakeLists.txt b/Demos/OpenGL/CMakeLists.txt
index a81ac92d6..b4beb9804 100644
--- a/Demos/OpenGL/CMakeLists.txt
+++ b/Demos/OpenGL/CMakeLists.txt
@@ -47,7 +47,7 @@ ELSE (WIN32)
 ENDIF (WIN32)
 
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics }
+${BULLET_PHYSICS_SOURCE_DIR}/src  }
 )
 
 ADD_LIBRARY(LibOpenGLSupport
diff --git a/Demos/UserCollisionAlgorithm/CMakeLists.txt b/Demos/UserCollisionAlgorithm/CMakeLists.txt
index 95b6858d8..dffe47708 100644
--- a/Demos/UserCollisionAlgorithm/CMakeLists.txt
+++ b/Demos/UserCollisionAlgorithm/CMakeLists.txt
@@ -48,11 +48,11 @@ ELSE (WIN32)
 ENDIF (WIN32)
 
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL  }
 )
 
 LINK_LIBRARIES(
-LibCcdPhysicsInterface LibOpenGLSupport LibBulletDynamics LibPhysicsCommonInterface LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
+ LibOpenGLSupport LibBulletDynamics  LibBulletCollision LibLinearMath    ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY}
 )
 
 ADD_EXECUTABLE(UserCollisionAlgorithm