diff --git a/CMakeLists.txt b/CMakeLists.txt index 98f1694fa..48119b6f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 2.4) PROJECT(BULLET_PHYSICS) +SET(BULLET_VERSION 2.73) IF (NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE "Release") diff --git a/Demos/AllBulletDemos/DemoEntries.cpp b/Demos/AllBulletDemos/DemoEntries.cpp index bce5b68d3..2f4c47613 100644 --- a/Demos/AllBulletDemos/DemoEntries.cpp +++ b/Demos/AllBulletDemos/DemoEntries.cpp @@ -32,7 +32,6 @@ subject to the following restrictions: #include "../ConstraintDemo/ConstraintDemo.h" #include "../Benchmarks/BenchmarkDemo.h" #include "../SoftDemo/SoftDemo.h" -#include "../TerrainDemo/TerrainDemo.h" #include "GlutStuff.h"//OpenGL stuff @@ -146,7 +145,6 @@ btDemoEntry g_demoEntries[] = {"Raytracer Test",Raytracer::Create}, {"GjkConvexCast",LinearConvexCastDemo::Create}, {"VehicleDemo",VehicleDemo::Create}, - {"TerrainDemo",btCreateTerrainDemo}, {"Benchmark 3000 FALL",BenchmarkDemo1::Create}, {"Benchmark 1000 STACK",BenchmarkDemo2::Create}, {"Benchmark 136 RAGDOLLS",BenchmarkDemo3::Create}, diff --git a/VERSION b/VERSION index dd344c44c..ae0a2e981 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1 @@ -Bullet Collision Detection and Physics Library version 2.72 -http://bullet.googlecode.com +2.73 \ No newline at end of file diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt index bbc2ec85f..cab6cb019 100644 --- a/src/BulletCollision/CMakeLists.txt +++ b/src/BulletCollision/CMakeLists.txt @@ -206,6 +206,8 @@ SET(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) diff --git a/src/BulletDynamics/CMakeLists.txt b/src/BulletDynamics/CMakeLists.txt index 96ea1bf85..ab71e579a 100644 --- a/src/BulletDynamics/CMakeLists.txt +++ b/src/BulletDynamics/CMakeLists.txt @@ -60,6 +60,8 @@ SET(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) diff --git a/src/BulletSoftBody/CMakeLists.txt b/src/BulletSoftBody/CMakeLists.txt index 454a1f5c6..0b5947a67 100644 --- a/src/BulletSoftBody/CMakeLists.txt +++ b/src/BulletSoftBody/CMakeLists.txt @@ -25,8 +25,9 @@ SET(BulletSoftBody_HDRS -#ADD_LIBRARY(BulletSoftBody SHARED ${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) diff --git a/src/LinearMath/CMakeLists.txt b/src/LinearMath/CMakeLists.txt index 6c2898947..ad76dbbd4 100644 --- a/src/LinearMath/CMakeLists.txt +++ b/src/LinearMath/CMakeLists.txt @@ -36,6 +36,8 @@ SET(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.6)