diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-08 11:43:06 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-08 11:43:06 +0300 |
commit | afacd184982e58a9c830a3d5366e25983939a7ba (patch) | |
tree | 311ee6e5abfcda32e3cbad133276512d68abe25b /extern/bullet2 | |
parent | 70df57df0f82be3966a09c8548bfde23fd5c17c4 (diff) |
use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.
Diffstat (limited to 'extern/bullet2')
-rw-r--r-- | extern/bullet2/CMakeLists.txt | 6 | ||||
-rw-r--r-- | extern/bullet2/src/BulletCollision/CMakeLists.txt | 48 | ||||
-rw-r--r-- | extern/bullet2/src/BulletDynamics/CMakeLists.txt | 44 | ||||
-rw-r--r-- | extern/bullet2/src/BulletSoftBody/CMakeLists.txt | 26 | ||||
-rw-r--r-- | extern/bullet2/src/CMakeLists.txt | 8 | ||||
-rw-r--r-- | extern/bullet2/src/LinearMath/CMakeLists.txt | 20 |
6 files changed, 76 insertions, 76 deletions
diff --git a/extern/bullet2/CMakeLists.txt b/extern/bullet2/CMakeLists.txt index ace5e988123..278a7d46e54 100644 --- a/extern/bullet2/CMakeLists.txt +++ b/extern/bullet2/CMakeLists.txt @@ -24,12 +24,12 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC +set(INC . src ) -SET(SRC +set(SRC src/BulletCollision/BroadphaseCollision/btAxisSweep3.cpp src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.cpp src/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.cpp @@ -319,4 +319,4 @@ SET(SRC src/btBulletDynamicsCommon.h ) -BLENDERLIB(extern_bullet "${SRC}" "${INC}") +blenderlib(extern_bullet "${SRC}" "${INC}") diff --git a/extern/bullet2/src/BulletCollision/CMakeLists.txt b/extern/bullet2/src/BulletCollision/CMakeLists.txt index ddc806a3e6a..c3c0224c8a3 100644 --- a/extern/bullet2/src/BulletCollision/CMakeLists.txt +++ b/extern/bullet2/src/BulletCollision/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } ) +include_directories( ${BULLET_PHYSICS_SOURCE_DIR}/src } ) -SET(BulletCollision_SRCS +set(BulletCollision_SRCS BroadphaseCollision/btAxisSweep3.cpp BroadphaseCollision/btBroadphaseProxy.cpp BroadphaseCollision/btCollisionAlgorithm.cpp @@ -88,10 +88,10 @@ SET(BulletCollision_SRCS NarrowPhaseCollision/btVoronoiSimplexSolver.cpp ) -SET(Root_HDRS +set(Root_HDRS ../btBulletCollisionCommon.h ) -SET(BroadphaseCollision_HDRS +set(BroadphaseCollision_HDRS BroadphaseCollision/btAxisSweep3.h BroadphaseCollision/btBroadphaseInterface.h BroadphaseCollision/btBroadphaseProxy.h @@ -105,7 +105,7 @@ SET(BroadphaseCollision_HDRS BroadphaseCollision/btQuantizedBvh.h BroadphaseCollision/btSimpleBroadphase.h ) -SET(CollisionDispatch_HDRS +set(CollisionDispatch_HDRS CollisionDispatch/btActivatingCollisionAlgorithm.h CollisionDispatch/btCollisionConfiguration.h CollisionDispatch/btCollisionCreateFunc.h @@ -129,7 +129,7 @@ SET(CollisionDispatch_HDRS CollisionDispatch/btUnionFind.h CollisionDispatch/SphereTriangleDetector.h ) -SET(CollisionShapes_HDRS +set(CollisionShapes_HDRS CollisionShapes/btBoxShape.h CollisionShapes/btBvhTriangleMeshShape.h CollisionShapes/btCapsuleShape.h @@ -166,7 +166,7 @@ SET(CollisionShapes_HDRS CollisionShapes/btTriangleMeshShape.h CollisionShapes/btUniformScalingShape.h ) -SET(Gimpact_HDRS +set(Gimpact_HDRS Gimpact/btGImpactShape.h Gimpact/gim_contact.h Gimpact/btGImpactBvh.h @@ -178,7 +178,7 @@ SET(Gimpact_HDRS Gimpact/btGImpactQuantizedBvh.h Gimpact/gim_box_set.h ) -SET(NarrowPhaseCollision_HDRS +set(NarrowPhaseCollision_HDRS NarrowPhaseCollision/btContinuousConvexCollision.h NarrowPhaseCollision/btConvexCast.h NarrowPhaseCollision/btConvexPenetrationDepthSolver.h @@ -197,7 +197,7 @@ SET(NarrowPhaseCollision_HDRS NarrowPhaseCollision/btVoronoiSimplexSolver.h ) -SET(BulletCollision_HDRS +set(BulletCollision_HDRS ${Root_HDRS} ${BroadphaseCollision_HDRS} ${CollisionDispatch_HDRS} @@ -207,28 +207,28 @@ SET(BulletCollision_HDRS ) -ADD_LIBRARY(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS}) +add_library(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS}) SET_TARGET_PROPERTIES(BulletCollision PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletCollision PROPERTIES SOVERSION ${BULLET_VERSION}) -IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletCollision LinearMath) -ENDIF (BUILD_SHARED_LIBS) +if(BUILD_SHARED_LIBS) + target_link_libraries(BulletCollision LinearMath) +endif() #INSTALL of other files requires CMake 2.6 -IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - 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.5) +if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + install(TARGETS BulletCollision DESTINATION lib) + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") +endif() -IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +if(APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) SET_TARGET_PROPERTIES(BulletCollision PROPERTIES FRAMEWORK true) 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) - SET_PROPERTY(SOURCE ${CollisionShapes_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionShapes) - SET_PROPERTY(SOURCE ${Gimpact_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Gimpact) - SET_PROPERTY(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision) + set_property(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision) + set_property(SOURCE ${CollisionDispatch_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionDispatch) + set_property(SOURCE ${CollisionShapes_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionShapes) + set_property(SOURCE ${Gimpact_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Gimpact) + set_property(SOURCE ${NarrowPhaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/NarrowPhaseCollision) -ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +endif() diff --git a/extern/bullet2/src/BulletDynamics/CMakeLists.txt b/extern/bullet2/src/BulletDynamics/CMakeLists.txt index ecfcbfef929..f605e6272f3 100644 --- a/extern/bullet2/src/BulletDynamics/CMakeLists.txt +++ b/extern/bullet2/src/BulletDynamics/CMakeLists.txt @@ -1,6 +1,6 @@ -INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src } ) +include_directories( ${BULLET_PHYSICS_SOURCE_DIR}/src } ) -SET(BulletDynamics_SRCS +set(BulletDynamics_SRCS ConstraintSolver/btContactConstraint.cpp ConstraintSolver/btConeTwistConstraint.cpp ConstraintSolver/btGeneric6DofConstraint.cpp @@ -19,11 +19,11 @@ SET(BulletDynamics_SRCS Character/btKinematicCharacterController.cpp ) -SET(Root_HDRS +set(Root_HDRS ../btBulletDynamicsCommon.h ../btBulletCollisionCommon.h ) -SET(ConstraintSolver_HDRS +set(ConstraintSolver_HDRS ConstraintSolver/btConstraintSolver.h ConstraintSolver/btContactConstraint.h ConstraintSolver/btContactSolverInfo.h @@ -39,27 +39,27 @@ SET(ConstraintSolver_HDRS ConstraintSolver/btSolverConstraint.h ConstraintSolver/btTypedConstraint.h ) -SET(Dynamics_HDRS +set(Dynamics_HDRS Dynamics/btContinuousDynamicsWorld.h Dynamics/btDiscreteDynamicsWorld.h Dynamics/btDynamicsWorld.h Dynamics/btSimpleDynamicsWorld.h Dynamics/btRigidBody.h ) -SET(Vehicle_HDRS +set(Vehicle_HDRS Vehicle/btRaycastVehicle.h Vehicle/btVehicleRaycaster.h Vehicle/btWheelInfo.h ) -SET(Character_HDRS +set(Character_HDRS Character/btCharacterControllerInterface.h Character/btKinematicCharacterController.h ) -SET(BulletDynamics_HDRS +set(BulletDynamics_HDRS ${Root_HDRS} ${ConstraintSolver_HDRS} ${Dynamics_HDRS} @@ -68,26 +68,26 @@ SET(BulletDynamics_HDRS ) -ADD_LIBRARY(BulletDynamics ${BulletDynamics_SRCS} ${BulletDynamics_HDRS}) +add_library(BulletDynamics ${BulletDynamics_SRCS} ${BulletDynamics_HDRS}) SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES SOVERSION ${BULLET_VERSION}) -IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletDynamics BulletCollision LinearMath) -ENDIF (BUILD_SHARED_LIBS) +if(BUILD_SHARED_LIBS) + target_link_libraries(BulletDynamics BulletCollision LinearMath) +endif() -IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - 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.5) +if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + install(TARGETS BulletDynamics DESTINATION lib) + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") +endif() -IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +if(APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES FRAMEWORK true) 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) - SET_PROPERTY(SOURCE ${Vehicle_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Vehicle) - SET_PROPERTY(SOURCE ${Character_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Character) + set_property(SOURCE ${ConstraintSolver_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/ConstraintSolver) + set_property(SOURCE ${Dynamics_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Dynamics) + set_property(SOURCE ${Vehicle_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Vehicle) + set_property(SOURCE ${Character_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Character) -ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +endif() diff --git a/extern/bullet2/src/BulletSoftBody/CMakeLists.txt b/extern/bullet2/src/BulletSoftBody/CMakeLists.txt index fe31d2bee71..16fc86f4c56 100644 --- a/extern/bullet2/src/BulletSoftBody/CMakeLists.txt +++ b/extern/bullet2/src/BulletSoftBody/CMakeLists.txt @@ -1,9 +1,9 @@ -INCLUDE_DIRECTORIES( +include_directories( ${BULLET_PHYSICS_SOURCE_DIR}/src } ) -SET(BulletSoftBody_SRCS +set(BulletSoftBody_SRCS btSoftBody.cpp btSoftBodyHelpers.cpp btSoftBodyRigidBodyCollisionConfiguration.cpp @@ -13,7 +13,7 @@ SET(BulletSoftBody_SRCS btSoftRigidDynamicsWorld.cpp ) -SET(BulletSoftBody_HDRS +set(BulletSoftBody_HDRS btSoftBody.h btSparseSDF.h btSoftBodyHelpers.h @@ -25,19 +25,19 @@ SET(BulletSoftBody_HDRS -ADD_LIBRARY(BulletSoftBody ${BulletSoftBody_SRCS} ${BulletSoftBody_HDRS}) +add_library(BulletSoftBody ${BulletSoftBody_SRCS} ${BulletSoftBody_HDRS}) SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES SOVERSION ${BULLET_VERSION}) -IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletSoftBody BulletDynamics) -ENDIF (BUILD_SHARED_LIBS) +if(BUILD_SHARED_LIBS) + target_link_libraries(BulletSoftBody BulletDynamics) +endif() -IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - INSTALL(TARGETS BulletSoftBody DESTINATION lib) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") -ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) +if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + install(TARGETS BulletSoftBody DESTINATION lib) + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") +endif() -IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +if(APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES FRAMEWORK true) SET_TARGET_PROPERTIES(BulletSoftBody PROPERTIES PUBLIC_HEADER "${BulletSoftBody_HDRS}") -ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +endif() diff --git a/extern/bullet2/src/CMakeLists.txt b/extern/bullet2/src/CMakeLists.txt index 9b8a5a7e00e..6c9b6b0127b 100644 --- a/extern/bullet2/src/CMakeLists.txt +++ b/extern/bullet2/src/CMakeLists.txt @@ -1,4 +1,4 @@ -ADD_SUBDIRECTORY(BulletCollision) -ADD_SUBDIRECTORY(BulletDynamics) -ADD_SUBDIRECTORY(LinearMath) -ADD_SUBDIRECTORY(BulletSoftBody ) +add_subdirectory(BulletCollision) +add_subdirectory(BulletDynamics) +add_subdirectory(LinearMath) +add_subdirectory(BulletSoftBody ) diff --git a/extern/bullet2/src/LinearMath/CMakeLists.txt b/extern/bullet2/src/LinearMath/CMakeLists.txt index 99d5a6a2fef..acd3dbc406d 100644 --- a/extern/bullet2/src/LinearMath/CMakeLists.txt +++ b/extern/bullet2/src/LinearMath/CMakeLists.txt @@ -1,16 +1,16 @@ -INCLUDE_DIRECTORIES( +include_directories( ${BULLET_PHYSICS_SOURCE_DIR}/src } ) -SET(LinearMath_SRCS +set(LinearMath_SRCS btConvexHull.cpp btQuickprof.cpp btGeometryUtil.cpp btAlignedAllocator.cpp ) -SET(LinearMath_HDRS +set(LinearMath_HDRS btAlignedObjectArray.h btList.h btPoolAllocator.h @@ -35,17 +35,17 @@ SET(LinearMath_HDRS btTransformUtil.h ) -ADD_LIBRARY(LinearMath ${LinearMath_SRCS} ${LinearMath_HDRS}) +add_library(LinearMath ${LinearMath_SRCS} ${LinearMath_HDRS}) SET_TARGET_PROPERTIES(LinearMath PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(LinearMath PROPERTIES SOVERSION ${BULLET_VERSION}) #FILES_MATCHING requires CMake 2.6 -IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - 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.5) +if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + install(TARGETS LinearMath DESTINATION lib) + install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") +endif() -IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +if(APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) SET_TARGET_PROPERTIES(LinearMath PROPERTIES FRAMEWORK true) SET_TARGET_PROPERTIES(LinearMath PROPERTIES PUBLIC_HEADER "${LinearMath_HDRS}") -ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +endif() |