From 9ea9a72524b1ff0d6128d3c667a15e8f744b5408 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Thu, 23 Jun 2022 14:15:38 +0100
Subject: [PATCH] another bullet packing bug
---
.gitlab-ci.yml | 2 +-
fggl/phys/bullet/CMakeLists.txt | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5253caa..89982a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ build:ubuntu:
stage: build
before_script:
- apt update && apt install -y build-essential cmake
- - apt install -y libglm-dev libglfw3-dev libopenal-dev libspdlog-dev libfreetype-dev libyaml-cpp-dev libassimp-dev libbullet-dev
+ - apt install -y libglm-dev libglfw3-dev libopenal-dev libspdlog-dev libfreetype-dev libyaml-cpp-dev libassimp-dev libbullet-dev libbullet-extras-dev
script:
- cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
- cmake --build build
diff --git a/fggl/phys/bullet/CMakeLists.txt b/fggl/phys/bullet/CMakeLists.txt
index 7c0a2a2..1530ad3 100644
--- a/fggl/phys/bullet/CMakeLists.txt
+++ b/fggl/phys/bullet/CMakeLists.txt
@@ -13,7 +13,8 @@ else()
target_compile_definitions(fggl PUBLIC ${BULLET_DEFINITIONS})
if ( BULLET_INCLUDE_DIRS STREQUAL "include/bullet" )
- # FIXME This might actually be a packaging bug?
+ # FIXME possible debian packing bug: path is relative in BulletConfig.cmake
+ # FIXME debian packaging bug: BulletConfig.cmake lists BulletInverseDynamics, but that's packaged in bullet-extras
target_include_directories(fggl PUBLIC ${BULLET_ROOT_DIR}/${BULLET_INCLUDE_DIRS})
else()
target_include_directories(fggl PUBLIC ${BULLET_INCLUDE_DIRS})
--
GitLab