Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix cmake to succeed with -DBUILD_BULLET3=0

Browse Source
This commit is contained in:
Andrew Meadows
2015-12-07 13:43:17 -08:00
parent aaf4e1acfa
commit a860fff3ad
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -279,7 +279,9 @@ ENDIF()
set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet ) set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet )
list (APPEND BULLET_LIBRARIES LinearMath) list (APPEND BULLET_LIBRARIES LinearMath)
list (APPEND BULLET_LIBRARIES BulletInverseDynamics) IF(BUILD_BULLET3)
list (APPEND BULLET_LIBRARIES BulletInverseDynamics)
ENDIF(BUILD_BULLET3)
list (APPEND BULLET_LIBRARIES BulletCollision) list (APPEND BULLET_LIBRARIES BulletCollision)
list (APPEND BULLET_LIBRARIES BulletDynamics) list (APPEND BULLET_LIBRARIES BulletDynamics)
list (APPEND BULLET_LIBRARIES BulletSoftBody) list (APPEND BULLET_LIBRARIES BulletSoftBody)

3
src/CMakeLists.txt
View File

@@ -1,9 +1,10 @@
IF(BUILD_BULLET3) IF(BUILD_BULLET3)
SUBDIRS( Bullet3OpenCL Bullet3Serialize/Bullet2FileLoader Bullet3Dynamics Bullet3Collision Bullet3Geometry Bullet3Common ) SUBDIRS( Bullet3OpenCL Bullet3Serialize/Bullet2FileLoader Bullet3Dynamics Bullet3Collision Bullet3Geometry Bullet3Common )
SUBDIRS( BulletInverseDynamics )
ENDIF(BUILD_BULLET3) ENDIF(BUILD_BULLET3)
SUBDIRS( BulletSoftBody BulletInverseDynamics BulletCollision BulletDynamics LinearMath ) SUBDIRS( BulletSoftBody BulletCollision BulletDynamics LinearMath )
IF(INSTALL_LIBS) IF(INSTALL_LIBS)

8
test/CMakeLists.txt
View File

@@ -1,3 +1,7 @@
#SUBDIRS( gtest-1.7.0 TestBullet3OpenCL) IF(BUILD_BULLET3)
SUBDIRS( gtest-1.7.0 collision InverseDynamics) #SUBDIRS( TestBullet3OpenCL )
SUBDIRS( InverseDynamics )
ENDIF(BUILD_BULLET3)
SUBDIRS( gtest-1.7.0 collision )