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 /source/blender | |
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 'source/blender')
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 99008309498..aca06a1abcf 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -259,7 +259,7 @@ endif() if(WITH_BULLET) list(APPEND INC_SYS - ../../../extern/bullet2/src + ${BULLET_INCLUDE_DIRS} ) add_definitions(-DUSE_BULLET) endif() diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 955b18c3db7..d11d74888ca 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -30,7 +30,6 @@ set(INC ../blenlib ../makesdna ../../../intern/guardedalloc - ../../../extern/bullet2/src ../../../extern/rangetree ../../../intern/opennl/extern ) @@ -127,6 +126,9 @@ endif() if(WITH_BULLET) add_definitions(-DWITH_BULLET) + list(APPEND INC_SYS + ${BULLET_INCLUDE_DIRS} + ) endif() if(WITH_INTERNATIONAL) |