more cmake fixes

2009-11-17 03:03:27 +00:00
parent d96818d994
commit f4c4e91904
38 changed files with 38 additions and 38 deletions
--- a/Demos/AllBulletDemos/CMakeLists.txt
+++ b/Demos/AllBulletDemos/CMakeLists.txt
@@ -13,7 +13,7 @@ LINK_DIRECTORIES(
 )

 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOURCE_DIR}/Extras  ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils  ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition  ${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/BulletColladaConverter ${BULLET_PHYSICS_SOURCE_DIR}/Extras  ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils  ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition  ${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(
--- a/Demos/BasicDemo/CMakeLists.txt
+++ b/Demos/BasicDemo/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(GLUT_ROOT ${BULLET_PHYSICS_SOURCE_DIR}/Glut)
 ########################################################

 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/Benchmarks/CMakeLists.txt
+++ b/Demos/Benchmarks/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/Box2dDemo/CMakeLists.txt
+++ b/Demos/Box2dDemo/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(GLUT_ROOT ${BULLET_PHYSICS_SOURCE_DIR}/Glut)
 ########################################################

 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/BspDemo/CMakeLists.txt
+++ b/Demos/BspDemo/CMakeLists.txt
@@ -10,7 +10,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL  }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL  
 )

 LINK_LIBRARIES(
--- a/Demos/BulletDinoDemo/CMakeLists.txt
+++ b/Demos/BulletDinoDemo/CMakeLists.txt
@@ -48,7 +48,7 @@ ELSE (WIN32)
 ENDIF (WIN32)

 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL  }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL  
 )

 LINK_LIBRARIES(
--- a/Demos/CcdPhysicsDemo/CMakeLists.txt
+++ b/Demos/CcdPhysicsDemo/CMakeLists.txt
@@ -12,7 +12,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/CharacterDemo/CMakeLists.txt
+++ b/Demos/CharacterDemo/CMakeLists.txt
@@ -10,7 +10,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/ColladaDemo/CMakeLists.txt
+++ b/Demos/ColladaDemo/CMakeLists.txt
@@ -12,7 +12,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter  ${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/BulletColladaConverter  ${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(
--- a/Demos/CollisionDemo/CMakeLists.txt
+++ b/Demos/CollisionDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/CollisionInterfaceDemo/CMakeLists.txt
+++ b/Demos/CollisionInterfaceDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/ConcaveConvexcastDemo/CMakeLists.txt
+++ b/Demos/ConcaveConvexcastDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/ConcaveDemo/CMakeLists.txt
+++ b/Demos/ConcaveDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/ConcaveRaycastDemo/CMakeLists.txt
+++ b/Demos/ConcaveRaycastDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/ConstraintDemo/CMakeLists.txt
+++ b/Demos/ConstraintDemo/CMakeLists.txt
@@ -12,7 +12,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/ContinuousConvexCollision/CMakeLists.txt
+++ b/Demos/ContinuousConvexCollision/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/DoublePrecisionDemo/CMakeLists.txt
+++ b/Demos/DoublePrecisionDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/DynamicControlDemo/CMakeLists.txt
+++ b/Demos/DynamicControlDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/ForkLiftDemo/CMakeLists.txt
+++ b/Demos/ForkLiftDemo/CMakeLists.txt
@@ -48,7 +48,7 @@ ELSE (WIN32)
 ENDIF (WIN32)

 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/GenericJointDemo/CMakeLists.txt
+++ b/Demos/GenericJointDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/GimpactTestDemo/CMakeLists.txt
+++ b/Demos/GimpactTestDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/GjkConvexCastDemo/CMakeLists.txt
+++ b/Demos/GjkConvexCastDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/Gpu2dDemo/CMakeLists.txt
+++ b/Demos/Gpu2dDemo/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(GLUT_ROOT ${BULLET_PHYSICS_SOURCE_DIR}/Glut)
 ########################################################

 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/Gpu3dDemo/CMakeLists.txt
+++ b/Demos/Gpu3dDemo/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(GLUT_ROOT ${BULLET_PHYSICS_SOURCE_DIR}/Glut)
 ########################################################

 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/HeightFieldFluidDemo/CMakeLists.txt
+++ b/Demos/HeightFieldFluidDemo/CMakeLists.txt
@@ -13,7 +13,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/HelloWorld/CMakeLists.txt
+++ b/Demos/HelloWorld/CMakeLists.txt
@@ -1,7 +1,7 @@
 # HelloWorld is a minimal sample creating, stepping and deleting a Bullet dynamics world

 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src }
+${BULLET_PHYSICS_SOURCE_DIR}/src 
 )

 LINK_LIBRARIES(
--- a/Demos/MiniCL_VectorAdd/CMakeLists.txt
+++ b/Demos/MiniCL_VectorAdd/CMakeLists.txt
@@ -2,7 +2,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src }
+${BULLET_PHYSICS_SOURCE_DIR}/src 
 )

 LINK_LIBRARIES(
--- a/Demos/MovingConcaveDemo/CMakeLists.txt
+++ b/Demos/MovingConcaveDemo/CMakeLists.txt
@@ -48,7 +48,7 @@ ELSE (WIN32)
 ENDIF (WIN32)

 INCLUDE_DIRECTORIES(
- ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/MultiMaterialDemo/CMakeLists.txt
+++ b/Demos/MultiMaterialDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/MultiThreadedDemo/CMakeLists.txt
+++ b/Demos/MultiThreadedDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/OpenGL/CMakeLists.txt
+++ b/Demos/OpenGL/CMakeLists.txt
@@ -14,7 +14,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexHull  }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexHull  
 )

 ADD_LIBRARY(OpenGLSupport
--- a/Demos/RagdollDemo/CMakeLists.txt
+++ b/Demos/RagdollDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/Raytracer/CMakeLists.txt
+++ b/Demos/Raytracer/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/SimplexDemo/CMakeLists.txt
+++ b/Demos/SimplexDemo/CMakeLists.txt
@@ -11,7 +11,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/SliderConstraintDemo/CMakeLists.txt
+++ b/Demos/SliderConstraintDemo/CMakeLists.txt
@@ -12,7 +12,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/SoftDemo/CMakeLists.txt
+++ b/Demos/SoftDemo/CMakeLists.txt
@@ -13,7 +13,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(
--- a/Demos/UserCollisionAlgorithm/CMakeLists.txt
+++ b/Demos/UserCollisionAlgorithm/CMakeLists.txt
@@ -12,7 +12,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL  }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL  
 )

 LINK_LIBRARIES(
--- a/Demos/VehicleDemo/CMakeLists.txt
+++ b/Demos/VehicleDemo/CMakeLists.txt
@@ -12,7 +12,7 @@


 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL }
+${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
 )

 LINK_LIBRARIES(