Add VERSION to CMake build.

http://code.google.com/p/bullet/issues/detail?id=137
Removed TerrainDemo from AllBulletDemos, it isn't properly tested (has grinds to a halt after running it for a while, shooting some objects on it).
This commit is contained in:
erwin.coumans
2008-11-07 00:10:29 +00:00
parent a69e03f497
commit 9aadc53322
7 changed files with 10 additions and 5 deletions

View File

@@ -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")

View File

@@ -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},

View File

@@ -1,2 +1 @@
Bullet Collision Detection and Physics Library version 2.72
http://bullet.googlecode.com
2.73

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)