From 5d89141357e07840fc3f8e5f2bbd687c76347586 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Thu, 19 Aug 2010 22:28:41 +0000 Subject: [PATCH] apply patch for building shared libraries (and frameworks) Thanks to ejtttje see Issue 357 --- .../GpuSoftBodySolvers/CPU/CMakeLists.txt | 3 +++ .../GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt | 5 ++++- .../GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/BulletMultiThreaded/GpuSoftBodySolvers/CPU/CMakeLists.txt b/src/BulletMultiThreaded/GpuSoftBodySolvers/CPU/CMakeLists.txt index 0eb83d15e..421849553 100644 --- a/src/BulletMultiThreaded/GpuSoftBodySolvers/CPU/CMakeLists.txt +++ b/src/BulletMultiThreaded/GpuSoftBodySolvers/CPU/CMakeLists.txt @@ -19,6 +19,9 @@ SET(BulletSoftBodyCPUSolvers_HDRS ADD_LIBRARY(BulletSoftBodySolvers_CPU ${BulletSoftBodyCPUSolvers_SRCS} ${BulletSoftBodyCPUSolvers_HDRS} ) SET_TARGET_PROPERTIES(BulletSoftBodySolvers_CPU PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletSoftBodySolvers_CPU PROPERTIES SOVERSION ${BULLET_VERSION}) +IF (BUILD_SHARED_LIBS) + TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_CPU BulletSoftBody) +ENDIF (BUILD_SHARED_LIBS) IF (INSTALL_LIBS) IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) diff --git a/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt b/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt index 65bbea43a..a4fc47ac4 100644 --- a/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt +++ b/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt @@ -50,7 +50,10 @@ ADD_LIBRARY(BulletSoftBodySolvers_OpenCL_Apple SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Apple PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Apple PROPERTIES SOVERSION ${BULLET_VERSION}) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletSoftBody BulletDynamics) + IF (APPLE AND (BUILD_SHARED_LIBS OR FRAMEWORK) ) + SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Apple PROPERTIES LINK_FLAGS "-framework OpenCL") + ENDIF (APPLE AND (BUILD_SHARED_LIBS OR FRAMEWORK) ) + TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_OpenCL_Apple BulletSoftBody) ENDIF (BUILD_SHARED_LIBS) diff --git a/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt b/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt index e9f86c2c9..f5eb02da1 100644 --- a/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt +++ b/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt @@ -52,7 +52,7 @@ ADD_LIBRARY(BulletSoftBodySolvers_OpenCL_Mini SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Mini PROPERTIES VERSION ${BULLET_VERSION}) SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Mini PROPERTIES SOVERSION ${BULLET_VERSION}) IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletSoftBody BulletDynamics) + TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_OpenCL_Mini MiniCL BulletMultiThreaded BulletSoftBody) ENDIF (BUILD_SHARED_LIBS)