diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-03 04:23:52 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-03 04:23:52 +0400 |
| commit | c2839bfe76139ed753e6b99118001bba5f2fa6ee (patch) | |
| tree | b1edb08f125ccf8220e41d359ef80c38f6213f32 /build_files/cmake/macros.cmake | |
| parent | 1a7638fa94fbe9c6244d054d20efa3405153747f (diff) | |
add option WITH_SYSTEM_BULLET to link against the bullet installation found on the system.
Note: this doesn't work yet for everything with latest stable bullet (2.81), need to look into why and likely apply some patches upstream.
However I managed to link blender by disabling some features, likely it can be made to work without too much trouble.
Diffstat (limited to 'build_files/cmake/macros.cmake')
| -rw-r--r-- | build_files/cmake/macros.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 4a4c0fe6d2d..bdd82a4f438 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -282,7 +282,9 @@ macro(setup_liblinks if(WITH_SYSTEM_GLEW) target_link_libraries(${target} ${GLEW_LIBRARY}) endif() - + if(WITH_BULLET AND WITH_SYSTEM_BULLET) + target_link_libraries(${target} ${BULLET_LIBRARIES}) + endif() if(WITH_OPENAL) target_link_libraries(${target} ${OPENAL_LIBRARY}) endif() |