From c0781fa9f1079f6b0203cd598c31399b16a10afc Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Fri, 9 Feb 2018 19:06:00 -0800 Subject: [PATCH] fix cmake build --- examples/SharedMemory/CMakeLists.txt | 9 +++++---- test/SharedMemory/CMakeLists.txt | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/examples/SharedMemory/CMakeLists.txt b/examples/SharedMemory/CMakeLists.txt index 4ea326d98..d1ab3af24 100644 --- a/examples/SharedMemory/CMakeLists.txt +++ b/examples/SharedMemory/CMakeLists.txt @@ -92,13 +92,14 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs ) +IF (USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD) + LINK_LIBRARIES(BulletSoftBody) +ENDIF() + LINK_LIBRARIES( Bullet3Common BulletWorldImporter BulletFileLoader BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision LinearMath BussIK ) -IF (USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD) - LINK_LIBRARIES(BulletSoftBody) -ENDIF() IF (WIN32) ADD_EXECUTABLE(App_PhysicsServer_SharedMemory @@ -149,7 +150,7 @@ INCLUDE_DIRECTORIES( ADD_DEFINITIONS(-DB3_USE_STANDALONE_EXAMPLE) LINK_LIBRARIES( - Bullet3Common BulletWorldImporter BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision LinearMath BussIK OpenGLWindow + BulletSoftBody Bullet3Common BulletWorldImporter BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision LinearMath BussIK OpenGLWindow ) diff --git a/test/SharedMemory/CMakeLists.txt b/test/SharedMemory/CMakeLists.txt index cba4b587c..e0798123f 100644 --- a/test/SharedMemory/CMakeLists.txt +++ b/test/SharedMemory/CMakeLists.txt @@ -11,13 +11,13 @@ INCLUDE_DIRECTORIES( #ADD_DEFINITIONS(-DGTEST_HAS_PTHREAD=1) ADD_DEFINITIONS(-DPHYSICS_LOOP_BACK -DPHYSICS_SERVER_DIRECT -DENABLE_GTEST -D_VARIADIC_MAX=10) +IF (USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD) + LINK_LIBRARIES(BulletSoftBody) +ENDIF() LINK_LIBRARIES( BulletInverseDynamicsUtils BulletInverseDynamics BulletFileLoader BulletWorldImporter Bullet3Common BulletDynamics BulletCollision LinearMath gtest BussIK ) -IF (USE_SOFT_BODY_MULTI_BODY_DYNAMICS_WORLD) - LINK_LIBRARIES(BulletSoftBody) -ENDIF() IF (NOT WIN32) LINK_LIBRARIES( pthread )