Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-01-03 04:23:52 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-01-03 04:23:52 +0400
commitc2839bfe76139ed753e6b99118001bba5f2fa6ee (patch)
treeb1edb08f125ccf8220e41d359ef80c38f6213f32 /extern/CMakeLists.txt
parent1a7638fa94fbe9c6244d054d20efa3405153747f (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 'extern/CMakeLists.txt')
-rw-r--r--extern/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 2f7f6584f0f..6ad6bdc316f 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -30,7 +30,9 @@ add_subdirectory(colamd)
add_subdirectory(rangetree)
if(WITH_BULLET)
- add_subdirectory(bullet2)
+ if(NOT WITH_SYSTEM_BULLET)
+ add_subdirectory(bullet2)
+ endif()
endif()
# now only available in a branch