From a860fff3adb21a03dc81faff2013bf94b28a1e60 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Mon, 7 Dec 2015 13:43:17 -0800 Subject: [PATCH] fix cmake to succeed with -DBUILD_BULLET3=0 --- CMakeLists.txt | 4 +++- src/CMakeLists.txt | 3 ++- test/CMakeLists.txt | 8 ++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e33f67f4..a376c0768 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -279,7 +279,9 @@ ENDIF() set (BULLET_CONFIG_CMAKE_PATH lib${LIB_SUFFIX}/cmake/bullet ) 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 BulletDynamics) list (APPEND BULLET_LIBRARIES BulletSoftBody) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 712139ff0..bbeabafbb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,9 +1,10 @@ IF(BUILD_BULLET3) SUBDIRS( Bullet3OpenCL Bullet3Serialize/Bullet2FileLoader Bullet3Dynamics Bullet3Collision Bullet3Geometry Bullet3Common ) + SUBDIRS( BulletInverseDynamics ) ENDIF(BUILD_BULLET3) -SUBDIRS( BulletSoftBody BulletInverseDynamics BulletCollision BulletDynamics LinearMath ) +SUBDIRS( BulletSoftBody BulletCollision BulletDynamics LinearMath ) IF(INSTALL_LIBS) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 45369660d..84877f619 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,3 +1,7 @@ -#SUBDIRS( gtest-1.7.0 TestBullet3OpenCL) -SUBDIRS( gtest-1.7.0 collision InverseDynamics) +IF(BUILD_BULLET3) + #SUBDIRS( TestBullet3OpenCL ) + SUBDIRS( InverseDynamics ) +ENDIF(BUILD_BULLET3) + +SUBDIRS( gtest-1.7.0 collision )