From dfa43af8184bf773d4d46a0f9f0ac4216808a49d Mon Sep 17 00:00:00 2001 From: scrawl Date: Tue, 7 Feb 2017 18:05:24 +0100 Subject: [PATCH] Update bullet dependency to 2.86 --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d19745ff7..6ba04426f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -254,11 +254,16 @@ IF(BOOST_STATIC) set(Boost_USE_STATIC_LIBS ON) endif() +set(REQUIRED_BULLET_VERSION 286) # Bullet 286 required due to runtime bugfixes for btCapsuleShape +if (DEFINED ENV{TRAVIS_BRANCH}) + set(REQUIRED_BULLET_VERSION 283) # but for build testing, 283 is fine +endif() + find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS}) find_package(MyGUI 3.2.1 REQUIRED) find_package(SDL2 REQUIRED) find_package(OpenAL REQUIRED) -find_package(Bullet 283 REQUIRED COMPONENTS BulletCollision LinearMath) +find_package(Bullet ${REQUIRED_BULLET_VERSION} REQUIRED COMPONENTS BulletCollision LinearMath) include_directories("." SYSTEM