From 2daf428386d68d504ea197ea8dd200daca0104de Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Thu, 6 Nov 2008 06:54:35 +0000 Subject: [PATCH] updated CMake support: remove Lib prefix, to facilitate Apple Framework support, add App prefix for demos See discussion here: http://code.google.com/p/bullet/issues/detail?id=129 --- Demos/AllBulletDemos/CMakeLists.txt | 4 ++-- Demos/BasicDemo/CMakeLists.txt | 4 ++-- Demos/Benchmarks/CMakeLists.txt | 4 ++-- Demos/BspDemo/CMakeLists.txt | 4 ++-- Demos/CcdPhysicsDemo/CMakeLists.txt | 4 ++-- Demos/CharacterDemo/CMakeLists.txt | 4 ++-- Demos/ColladaDemo/CMakeLists.txt | 4 ++-- Demos/ConstraintDemo/CMakeLists.txt | 4 ++-- Demos/ConvexDecompositionDemo/CMakeLists.txt | 4 ++-- Demos/ForkLiftDemo/CMakeLists.txt | 4 ++-- Demos/GenericJointDemo/CMakeLists.txt | 4 ++-- Demos/HelloWorld/CMakeLists.txt | 4 ++-- Demos/MovingConcaveDemo/CMakeLists.txt | 4 ++-- Demos/MultiThreadedDemo/CMakeLists.txt | 6 +++--- Demos/OpenGL/CMakeLists.txt | 4 ++-- Demos/RagdollDemo/CMakeLists.txt | 4 ++-- Demos/SliderConstraintDemo/CMakeLists.txt | 4 ++-- Demos/SoftDemo/CMakeLists.txt | 4 ++-- Demos/UserCollisionAlgorithm/CMakeLists.txt | 4 ++-- Demos/VehicleDemo/CMakeLists.txt | 4 ++-- Extras/BulletColladaConverter/CMakeLists.txt | 4 ++-- Extras/COLLADA_DOM/CMakeLists.txt | 4 ++-- Extras/ConvexDecomposition/CMakeLists.txt | 4 ++-- Extras/GIMPACTUtils/CMakeLists.txt | 4 ++-- Extras/LibXML/CMakeLists.txt | 4 ++-- Extras/glui/CMakeLists.txt | 4 ++-- Extras/iff/CMakeLists.txt | 2 +- src/BulletCollision/CMakeLists.txt | 18 ++++++++---------- src/BulletDynamics/CMakeLists.txt | 17 ++++++++--------- src/BulletMultiThreaded/CMakeLists.txt | 4 ++-- src/BulletSoftBody/CMakeLists.txt | 18 +++++++++--------- src/CMakeLists.txt | 2 +- src/LinearMath/CMakeLists.txt | 14 ++++++-------- 33 files changed, 88 insertions(+), 93 deletions(-) diff --git a/Demos/AllBulletDemos/CMakeLists.txt b/Demos/AllBulletDemos/CMakeLists.txt index 80e421878..86e400efc 100644 --- a/Demos/AllBulletDemos/CMakeLists.txt +++ b/Demos/AllBulletDemos/CMakeLists.txt @@ -17,12 +17,12 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOUR ) LINK_LIBRARIES( -LibBulletColladaConverter LibGLUI LibGIMPACTUtils LibConvexDecomposition LibColladaDom LibXML LibOpenGLSupport LibBulletSoftBody LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +BulletColladaConverter GLUI GIMPACTUtils ConvexDecomposition ColladaDom XML OpenGLSupport BulletSoftBody BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(AllBulletDemos +ADD_EXECUTABLE(AppAllBulletDemos Main.cpp DemoEntries.cpp ../CcdPhysicsDemo/CcdPhysicsDemo.cpp diff --git a/Demos/BasicDemo/CMakeLists.txt b/Demos/BasicDemo/CMakeLists.txt index 32c667510..32baf8b88 100644 --- a/Demos/BasicDemo/CMakeLists.txt +++ b/Demos/BasicDemo/CMakeLists.txt @@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(BasicDemo +ADD_EXECUTABLE(AppBasicDemo main.cpp BasicDemo.cpp ) diff --git a/Demos/Benchmarks/CMakeLists.txt b/Demos/Benchmarks/CMakeLists.txt index fd5c76fd9..fe144fab0 100644 --- a/Demos/Benchmarks/CMakeLists.txt +++ b/Demos/Benchmarks/CMakeLists.txt @@ -15,10 +15,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(Benchmarks +ADD_EXECUTABLE(AppBenchmarks main.cpp BenchmarkDemo.cpp ) diff --git a/Demos/BspDemo/CMakeLists.txt b/Demos/BspDemo/CMakeLists.txt index f3a6572f6..967810349 100644 --- a/Demos/BspDemo/CMakeLists.txt +++ b/Demos/BspDemo/CMakeLists.txt @@ -14,10 +14,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( - LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} + OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(BspPhysicsDemo +ADD_EXECUTABLE(AppBspPhysicsDemo main.cpp BspDemo.cpp BspLoader.cpp diff --git a/Demos/CcdPhysicsDemo/CMakeLists.txt b/Demos/CcdPhysicsDemo/CMakeLists.txt index 8bae751ae..36dad7bcf 100644 --- a/Demos/CcdPhysicsDemo/CMakeLists.txt +++ b/Demos/CcdPhysicsDemo/CMakeLists.txt @@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(CcdPhysicsDemo +ADD_EXECUTABLE(AppCcdPhysicsDemo main.cpp CcdPhysicsDemo.cpp ) diff --git a/Demos/CharacterDemo/CMakeLists.txt b/Demos/CharacterDemo/CMakeLists.txt index 8561347e2..74870c85c 100644 --- a/Demos/CharacterDemo/CMakeLists.txt +++ b/Demos/CharacterDemo/CMakeLists.txt @@ -14,10 +14,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( - LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} + OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(CharacterDemo +ADD_EXECUTABLE(AppCharacterDemo KinematicCharacterController.cpp DynamicCharacterController.cpp KinematicCharacterController.h diff --git a/Demos/ColladaDemo/CMakeLists.txt b/Demos/ColladaDemo/CMakeLists.txt index 41c8c392f..9b5449289 100644 --- a/Demos/ColladaDemo/CMakeLists.txt +++ b/Demos/ColladaDemo/CMakeLists.txt @@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOU ) LINK_LIBRARIES( -LibBulletColladaConverter LibColladaDom LibXML LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +BulletColladaConverter ColladaDom XML OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(ColladaDemo +ADD_EXECUTABLE(AppColladaDemo ColladaDemo.cpp ) diff --git a/Demos/ConstraintDemo/CMakeLists.txt b/Demos/ConstraintDemo/CMakeLists.txt index b6c23352c..c99fe5735 100644 --- a/Demos/ConstraintDemo/CMakeLists.txt +++ b/Demos/ConstraintDemo/CMakeLists.txt @@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(ConstraintDemo +ADD_EXECUTABLE(AppConstraintDemo ConstraintDemo.cpp main.cpp ) diff --git a/Demos/ConvexDecompositionDemo/CMakeLists.txt b/Demos/ConvexDecompositionDemo/CMakeLists.txt index b4c484f77..00bf5ac91 100644 --- a/Demos/ConvexDecompositionDemo/CMakeLists.txt +++ b/Demos/ConvexDecompositionDemo/CMakeLists.txt @@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL ${BUL ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath LibConvexDecomposition ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +OpenGLSupport BulletDynamics BulletCollision LinearMath ConvexDecomposition ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(ConvexDecompositionDemo +ADD_EXECUTABLE(AppConvexDecompositionDemo main.cpp ConvexDecompositionDemo.cpp ) diff --git a/Demos/ForkLiftDemo/CMakeLists.txt b/Demos/ForkLiftDemo/CMakeLists.txt index 5bc47f9aa..6a930af77 100644 --- a/Demos/ForkLiftDemo/CMakeLists.txt +++ b/Demos/ForkLiftDemo/CMakeLists.txt @@ -52,10 +52,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY} +OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glU_LIBRARY} ) -ADD_EXECUTABLE(ForkLiftDemo +ADD_EXECUTABLE(AppForkLiftDemo ForkLiftDemo.cpp main.cpp ) diff --git a/Demos/GenericJointDemo/CMakeLists.txt b/Demos/GenericJointDemo/CMakeLists.txt index b8f8af7bf..07b44f97b 100644 --- a/Demos/GenericJointDemo/CMakeLists.txt +++ b/Demos/GenericJointDemo/CMakeLists.txt @@ -15,10 +15,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(GenericJointDemo +ADD_EXECUTABLE(AppGenericJointDemo GenericJointDemo.cpp Ragdoll.cpp ) diff --git a/Demos/HelloWorld/CMakeLists.txt b/Demos/HelloWorld/CMakeLists.txt index 622f2ca55..084375122 100644 --- a/Demos/HelloWorld/CMakeLists.txt +++ b/Demos/HelloWorld/CMakeLists.txt @@ -5,10 +5,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src } ) LINK_LIBRARIES( - LibBulletDynamics LibBulletCollision LibLinearMath + BulletDynamics BulletCollision LinearMath ) -ADD_EXECUTABLE(HelloWorld +ADD_EXECUTABLE(AppHelloWorld HelloWorld.cpp ) diff --git a/Demos/MovingConcaveDemo/CMakeLists.txt b/Demos/MovingConcaveDemo/CMakeLists.txt index d1692e711..1067ff030 100644 --- a/Demos/MovingConcaveDemo/CMakeLists.txt +++ b/Demos/MovingConcaveDemo/CMakeLists.txt @@ -52,10 +52,10 @@ INCLUDE_DIRECTORIES( ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(MovingConcaveDemo +ADD_EXECUTABLE(AppMovingConcaveDemo ConcavePhysicsDemo.cpp ) diff --git a/Demos/MultiThreadedDemo/CMakeLists.txt b/Demos/MultiThreadedDemo/CMakeLists.txt index a2d15d79f..3bd05c03b 100644 --- a/Demos/MultiThreadedDemo/CMakeLists.txt +++ b/Demos/MultiThreadedDemo/CMakeLists.txt @@ -15,15 +15,15 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletMultiThreaded LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +OpenGLSupport BulletMultiThreaded BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(MultiThreadedDemo +ADD_EXECUTABLE(AppMultiThreadedDemo main.cpp MultiThreadedDemo.cpp MultiThreadedDemo.h ) IF (UNIX) - TARGET_LINK_LIBRARIES(MultiThreadedDemo pthread) + TARGET_LINK_LIBRARIES(AppMultiThreadedDemo pthread) ENDIF(UNIX) diff --git a/Demos/OpenGL/CMakeLists.txt b/Demos/OpenGL/CMakeLists.txt index 261b7794d..3c61db6dd 100644 --- a/Demos/OpenGL/CMakeLists.txt +++ b/Demos/OpenGL/CMakeLists.txt @@ -17,7 +17,7 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexHull } ) -ADD_LIBRARY(LibOpenGLSupport +ADD_LIBRARY(OpenGLSupport BMF_Api.cpp BMF_BitmapFont.cpp BMF_font_helv10.cpp @@ -30,5 +30,5 @@ ADD_LIBRARY(LibOpenGLSupport ) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(LibOpenGLSupport LibBulletDynamics LibBulletCollision ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) + TARGET_LINK_LIBRARIES(OpenGLSupport BulletDynamics BulletCollision ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) ENDIF (BUILD_SHARED_LIBS) diff --git a/Demos/RagdollDemo/CMakeLists.txt b/Demos/RagdollDemo/CMakeLists.txt index fd5915e5b..4f079ac63 100644 --- a/Demos/RagdollDemo/CMakeLists.txt +++ b/Demos/RagdollDemo/CMakeLists.txt @@ -15,10 +15,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(RagdollDemo +ADD_EXECUTABLE(AppRagdollDemo RagdollDemo.cpp main.cpp ) diff --git a/Demos/SliderConstraintDemo/CMakeLists.txt b/Demos/SliderConstraintDemo/CMakeLists.txt index 8cbed81d6..5a5653f27 100644 --- a/Demos/SliderConstraintDemo/CMakeLists.txt +++ b/Demos/SliderConstraintDemo/CMakeLists.txt @@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(SliderConstraintDemo +ADD_EXECUTABLE(AppSliderConstraintDemo SliderConstraintDemo.cpp main.cpp ) diff --git a/Demos/SoftDemo/CMakeLists.txt b/Demos/SoftDemo/CMakeLists.txt index a8bea3563..5e7941f72 100644 --- a/Demos/SoftDemo/CMakeLists.txt +++ b/Demos/SoftDemo/CMakeLists.txt @@ -17,10 +17,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( -LibOpenGLSupport LibBulletSoftBody LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} +OpenGLSupport BulletSoftBody BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(SoftBodyDemo +ADD_EXECUTABLE(AppSoftBodyDemo main.cpp SoftDemo.cpp ) diff --git a/Demos/UserCollisionAlgorithm/CMakeLists.txt b/Demos/UserCollisionAlgorithm/CMakeLists.txt index 901cd0f8f..19a7ef03b 100644 --- a/Demos/UserCollisionAlgorithm/CMakeLists.txt +++ b/Demos/UserCollisionAlgorithm/CMakeLists.txt @@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( - LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} + OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(UserCollisionAlgorithm +ADD_EXECUTABLE(AppUserCollisionAlgorithm UserCollisionAlgorithm.cpp ) diff --git a/Demos/VehicleDemo/CMakeLists.txt b/Demos/VehicleDemo/CMakeLists.txt index 9c345c8e5..31303126b 100644 --- a/Demos/VehicleDemo/CMakeLists.txt +++ b/Demos/VehicleDemo/CMakeLists.txt @@ -16,10 +16,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL } ) LINK_LIBRARIES( - LibOpenGLSupport LibBulletDynamics LibBulletCollision LibLinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} + OpenGLSupport BulletDynamics BulletCollision LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) -ADD_EXECUTABLE(VehicleDemo +ADD_EXECUTABLE(AppVehicleDemo VehicleDemo.cpp main.cpp ) diff --git a/Extras/BulletColladaConverter/CMakeLists.txt b/Extras/BulletColladaConverter/CMakeLists.txt index c65741897..f57bca05f 100644 --- a/Extras/BulletColladaConverter/CMakeLists.txt +++ b/Extras/BulletColladaConverter/CMakeLists.txt @@ -2,11 +2,11 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexHull ${BULLET_PHYSICS_SOURCE_DIR}/Extras/BulletColladaConverter ${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include ${BULLET_PHYSICS_SOURCE_DIR}/Extras/COLLADA_DOM/include/1.4 ) -ADD_LIBRARY(LibBulletColladaConverter +ADD_LIBRARY(BulletColladaConverter ColladaConverter.h ColladaConverter.cpp ) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(LibBulletColladaConverter LibColladaDom LibBulletCollision LibBulletDynamics) + TARGET_LINK_LIBRARIES(BulletColladaConverter ColladaDom BulletCollision BulletDynamics) ENDIF (BUILD_SHARED_LIBS) diff --git a/Extras/COLLADA_DOM/CMakeLists.txt b/Extras/COLLADA_DOM/CMakeLists.txt index ac061a458..4c0d40e57 100644 --- a/Extras/COLLADA_DOM/CMakeLists.txt +++ b/Extras/COLLADA_DOM/CMakeLists.txt @@ -6,7 +6,7 @@ ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS) ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE) -ADD_LIBRARY(LibColladaDom +ADD_LIBRARY(ColladaDom src/1.4/dom/domAccessor.cpp src/1.4/dom/domAnimation.cpp src/1.4/dom/domAnimation_clip.cpp @@ -209,5 +209,5 @@ ADD_LIBRARY(LibColladaDom ) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(LibColladaDom LibXML) + TARGET_LINK_LIBRARIES(ColladaDom XML) ENDIF (BUILD_SHARED_LIBS) diff --git a/Extras/ConvexDecomposition/CMakeLists.txt b/Extras/ConvexDecomposition/CMakeLists.txt index 7ac88e018..4509f4951 100644 --- a/Extras/ConvexDecomposition/CMakeLists.txt +++ b/Extras/ConvexDecomposition/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition ${BULLET_PHYSICS_SOURCE_DIR}/src ) -ADD_LIBRARY(LibConvexDecomposition +ADD_LIBRARY(ConvexDecomposition ConvexDecomposition.h bestfitobb.cpp cd_vector.h concavity.h float_math.h planetri.h splitplane.h ConvexBuilder.cpp bestfitobb.h cd_wavefront.cpp fitsphere.cpp meshvolume.cpp raytri.cpp vlookup.cpp ConvexBuilder.h bestfit.cpp cd_hull.cpp cd_wavefront.h fitsphere.h meshvolume.h raytri.h vlookup.h @@ -11,5 +11,5 @@ ConvexDecomposition.cpp bestfit.h cd_hull.h concavity.cpp float_math.cpp pla ) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(LibConvexDecomposition LibBulletCollision LibLinearMath) + TARGET_LINK_LIBRARIES(ConvexDecomposition BulletCollision LinearMath) ENDIF (BUILD_SHARED_LIBS) diff --git a/Extras/GIMPACTUtils/CMakeLists.txt b/Extras/GIMPACTUtils/CMakeLists.txt index f20b065e1..e33f7197d 100644 --- a/Extras/GIMPACTUtils/CMakeLists.txt +++ b/Extras/GIMPACTUtils/CMakeLists.txt @@ -5,10 +5,10 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition ) -ADD_LIBRARY(LibGIMPACTUtils +ADD_LIBRARY(GIMPACTUtils btGImpactConvexDecompositionShape.cpp btGImpactConvexDecompositionShape.h ) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(LibGIMPACTUtils LibConvexDecomposition LibBulletCollision) + TARGET_LINK_LIBRARIES(GIMPACTUtils ConvexDecomposition BulletCollision) ENDIF (BUILD_SHARED_LIBS) diff --git a/Extras/LibXML/CMakeLists.txt b/Extras/LibXML/CMakeLists.txt index 56f0f8713..5b5c4d5d4 100644 --- a/Extras/LibXML/CMakeLists.txt +++ b/Extras/LibXML/CMakeLists.txt @@ -8,7 +8,7 @@ ADD_DEFINITIONS( -D_CRT_SECURE_NO_DEPRECATE) -ADD_LIBRARY(LibXML +ADD_LIBRARY(XML c14n.c catalog.c chvalid.c @@ -55,4 +55,4 @@ ADD_LIBRARY(LibXML xmlwriter.c xpath.c xpointer.c -) \ No newline at end of file +) diff --git a/Extras/glui/CMakeLists.txt b/Extras/glui/CMakeLists.txt index 4cd7e8946..f5f0d5671 100644 --- a/Extras/glui/CMakeLists.txt +++ b/Extras/glui/CMakeLists.txt @@ -51,7 +51,7 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/Extras/glui } ) -ADD_LIBRARY(LibGLUI +ADD_LIBRARY(GLUI arcball.h glui_checkbox.cpp glui_internal.h glui_panel.cpp glui_spinner.cpp glui_treepanel.cpp GL glui.cpp glui_column.cpp glui_internal_control.h glui_radio.cpp glui_statictext.cpp glui_window.cpp Jamfile glui_add_controls.cpp glui_commandline.cpp glui_list.cpp glui_rollout.cpp glui_string.cpp quaternion.cpp @@ -62,5 +62,5 @@ arcball.cpp glui_button.cpp glui_filebrowser.cpp glui_node.cpp glui_separ ) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(LibGLUI ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) + TARGET_LINK_LIBRARIES(GLUI ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) ENDIF (BUILD_SHARED_LIBS) diff --git a/Extras/iff/CMakeLists.txt b/Extras/iff/CMakeLists.txt index 907becda0..16bdd165a 100644 --- a/Extras/iff/CMakeLists.txt +++ b/Extras/iff/CMakeLists.txt @@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/Extras/iff ) -ADD_LIBRARY(LibIff +ADD_LIBRARY(Iff iff.h iffr.cpp iffw.cpp diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt index 1c333f1fd..bbc2ec85f 100644 --- a/src/BulletCollision/CMakeLists.txt +++ b/src/BulletCollision/CMakeLists.txt @@ -1,6 +1,6 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } ) -SET(LibBulletCollision_SRCS +SET(BulletCollision_SRCS BroadphaseCollision/btAxisSweep3.cpp BroadphaseCollision/btBroadphaseProxy.cpp BroadphaseCollision/btCollisionAlgorithm.cpp @@ -195,7 +195,7 @@ SET(NarrowPhaseCollision_HDRS NarrowPhaseCollision/btVoronoiSimplexSolver.h ) -SET(LibBulletCollision_HDRS +SET(BulletCollision_HDRS ${Root_HDRS} ${BroadphaseCollision_HDRS} ${CollisionDispatch_HDRS} @@ -205,23 +205,21 @@ SET(LibBulletCollision_HDRS ) -#ADD_LIBRARY(LibBulletCollision SHARED ${LibBulletCollision_SRCS} ${LibBulletCollision_HDRS}) - -ADD_LIBRARY(LibBulletCollision ${LibBulletCollision_SRCS} ${LibBulletCollision_HDRS}) +ADD_LIBRARY(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS}) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(LibBulletCollision LibLinearMath) + TARGET_LINK_LIBRARIES(BulletCollision LinearMath) ENDIF (BUILD_SHARED_LIBS) #INSTALL of other files requires CMake 2.6 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6) - #INSTALL_TARGETS(DESTINATION LibBulletCollision) - #INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include ${LibBulletCollision_HDRS}) + INSTALL(TARGETS BulletCollision DESTINATION lib) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - SET_TARGET_PROPERTIES(LibBulletCollision PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(BulletCollision PROPERTIES FRAMEWORK true) - SET_TARGET_PROPERTIES(LibBulletCollision PROPERTIES PUBLIC_HEADER "${Root_HDRS}") + SET_TARGET_PROPERTIES(BulletCollision PROPERTIES PUBLIC_HEADER "${Root_HDRS}") # Have to list out sub-directories manually: SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision) SET_PROPERTY(SOURCE ${CollisionDispatch_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionDispatch) diff --git a/src/BulletDynamics/CMakeLists.txt b/src/BulletDynamics/CMakeLists.txt index d7b8a8f4f..96ea1bf85 100644 --- a/src/BulletDynamics/CMakeLists.txt +++ b/src/BulletDynamics/CMakeLists.txt @@ -1,6 +1,6 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } ) -SET(LibBulletDynamics_SRCS +SET(BulletDynamics_SRCS ConstraintSolver/btContactConstraint.cpp ConstraintSolver/btConeTwistConstraint.cpp ConstraintSolver/btGeneric6DofConstraint.cpp @@ -51,29 +51,28 @@ SET(Vehicle_HDRS Vehicle/btWheelInfo.h ) -SET(LibBulletDynamics_HDRS +SET(BulletDynamics_HDRS ${Root_HDRS} ${ConstraintSolver_HDRS} ${Dynamics_HDRS} ${Vehicle_HDRS} ) -#ADD_LIBRARY(LibBulletDynamics SHARED ${LibBulletDynamics_SRCS} ${LibBulletDynamics_HDRS}) -ADD_LIBRARY(LibBulletDynamics ${LibBulletDynamics_SRCS} ${LibBulletDynamics_HDRS}) +ADD_LIBRARY(BulletDynamics ${BulletDynamics_SRCS} ${BulletDynamics_HDRS}) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(LibBulletDynamics LibBulletCollision LibLinearMath) + TARGET_LINK_LIBRARIES(BulletDynamics BulletCollision LinearMath) ENDIF (BUILD_SHARED_LIBS) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6) - #INSTALL(TARGETS LibBulletDynamics DESTINATION lib) - #INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") + INSTALL(TARGETS BulletDynamics DESTINATION lib) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - SET_TARGET_PROPERTIES(LibBulletDynamics PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES FRAMEWORK true) - SET_TARGET_PROPERTIES(LibBulletDynamics PROPERTIES PUBLIC_HEADER "${Root_HDRS}") + SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES PUBLIC_HEADER "${Root_HDRS}") # Have to list out sub-directories manually: SET_PROPERTY(SOURCE ${ConstraintSolver_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/ConstraintSolver) SET_PROPERTY(SOURCE ${Dynamics_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Dynamics) diff --git a/src/BulletMultiThreaded/CMakeLists.txt b/src/BulletMultiThreaded/CMakeLists.txt index ffcce358d..606e33f43 100644 --- a/src/BulletMultiThreaded/CMakeLists.txt +++ b/src/BulletMultiThreaded/CMakeLists.txt @@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src/BulletMultiThreaded/vectormath/scalar/cpp ) -ADD_LIBRARY(LibBulletMultiThreaded +ADD_LIBRARY(BulletMultiThreaded PlatformDefinitions.h SpuFakeDma.cpp SpuFakeDma.h @@ -69,5 +69,5 @@ ADD_LIBRARY(LibBulletMultiThreaded ) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(LibBulletMultiThreaded LibBulletCollision) + TARGET_LINK_LIBRARIES(BulletMultiThreaded BulletCollision) ENDIF (BUILD_SHARED_LIBS) diff --git a/src/BulletSoftBody/CMakeLists.txt b/src/BulletSoftBody/CMakeLists.txt index 07b1abd47..454a1f5c6 100644 --- a/src/BulletSoftBody/CMakeLists.txt +++ b/src/BulletSoftBody/CMakeLists.txt @@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } ) -SET(LibBulletSoftBody_SRCS +SET(BulletSoftBody_SRCS btSoftBody.cpp btSoftBodyHelpers.cpp btSoftBodyRigidBodyCollisionConfiguration.cpp @@ -13,7 +13,7 @@ SET(LibBulletSoftBody_SRCS btSoftRigidDynamicsWorld.cpp ) -SET(LibBulletSoftBody_HDRS +SET(BulletSoftBody_HDRS btSoftBody.h btSparseSDF.h btSoftBodyHelpers.h @@ -25,18 +25,18 @@ SET(LibBulletSoftBody_HDRS -#ADD_LIBRARY(LibBulletSoftBody SHARED ${LibBulletSoftBody_SRCS} ${LibBulletSoftBody_HDRS}) -ADD_LIBRARY(LibBulletSoftBody ${LibBulletSoftBody_SRCS} ${LibBulletSoftBody_HDRS}) +#ADD_LIBRARY(BulletSoftBody SHARED ${BulletSoftBody_SRCS} ${BulletSoftBody_HDRS}) +ADD_LIBRARY(BulletSoftBody ${BulletSoftBody_SRCS} ${BulletSoftBody_HDRS}) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(LibBulletSoftBody LibBulletDynamics) + TARGET_LINK_LIBRARIES(BulletSoftBody BulletDynamics) ENDIF (BUILD_SHARED_LIBS) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6) - INSTALL(TARGETS LibBulletSoftBody DESTINATION lib) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include ${LibBulletSoftBody_HDRS}) + INSTALL(TARGETS BulletSoftBody DESTINATION lib) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include ${BulletSoftBody_HDRS}) ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - SET_TARGET_PROPERTIES(LibBulletSoftBody PROPERTIES FRAMEWORK true) - SET_TARGET_PROPERTIES(LibBulletSoftBody PROPERTIES PUBLIC_HEADER "${LibBulletSoftBody_HDRS}") + SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES PUBLIC_HEADER "${BulletSoftBody_HDRS}") ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f4df746b7..5689149f7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,7 +4,7 @@ else (CMAKE_SIZEOF_VOID_P MATCHES "8") SUBDIRS( BulletMultiThreaded BulletSoftBody BulletCollision BulletDynamics LinearMath ) endif (CMAKE_SIZEOF_VOID_P MATCHES "8") -#INSTALL of other files requires CMake 2.6^M +#INSTALL of other files requires CMake 2.6 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6) INSTALL(FILES btBulletCollisionCommon.h btBulletDynamicsCommon.h Bullet-C-Api.h DESTINATION include) ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6) diff --git a/src/LinearMath/CMakeLists.txt b/src/LinearMath/CMakeLists.txt index 99d23a4c4..6c2898947 100644 --- a/src/LinearMath/CMakeLists.txt +++ b/src/LinearMath/CMakeLists.txt @@ -3,14 +3,14 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } ) -SET(LibLinearMath_SRCS +SET(LinearMath_SRCS btConvexHull.cpp btQuickprof.cpp btGeometryUtil.cpp btAlignedAllocator.cpp ) -SET(LibLinearMath_HDRS +SET(LinearMath_HDRS btAlignedObjectArray.h btList.h btPoolAllocator.h @@ -35,17 +35,15 @@ SET(LibLinearMath_HDRS btTransformUtil.h ) -# ADD_LIBRARY(LibLinearMath SHARED ${LibLinearMath_SRCS} ${LibLinearMath_HDRS}) -ADD_LIBRARY(LibLinearMath ${LibLinearMath_SRCS} ${LibLinearMath_HDRS}) +ADD_LIBRARY(LinearMath ${LinearMath_SRCS} ${LinearMath_HDRS}) #FILES_MATCHING requires CMake 2.6 - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6) - INSTALL(TARGETS LibLinearMath DESTINATION lib) + INSTALL(TARGETS LinearMath DESTINATION lib) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.6) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - SET_TARGET_PROPERTIES(LibLinearMath PROPERTIES FRAMEWORK true) - SET_TARGET_PROPERTIES(LibLinearMath PROPERTIES PUBLIC_HEADER "${LibLinearMath_HDRS}") + SET_TARGET_PROPERTIES(LinearMath PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(LinearMath PROPERTIES PUBLIC_HEADER "${LinearMath_HDRS}") ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)