diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5253caa99be09dc98e1494bfe02b5cb3285711d3..89982a477eed30d09458f4d76f7d3e5c6c4b55cd 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 7c0a2a2ce6d1dfe8c789c74f38014d333b26fbad..1530ad34deb8b1c1e020d6d47ae904b3d3e881bb 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})