Skip to content
Snippets Groups Projects
Commit 9ea9a725 authored by Joseph Walton-Rivers's avatar Joseph Walton-Rivers
Browse files

another bullet packing bug

parent 0cda715d
No related branches found
No related tags found
No related merge requests found
...@@ -41,7 +41,7 @@ build:ubuntu: ...@@ -41,7 +41,7 @@ build:ubuntu:
stage: build stage: build
before_script: before_script:
- apt update && apt install -y build-essential cmake - 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: script:
- cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug - cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
- cmake --build build - cmake --build build
......
...@@ -13,7 +13,8 @@ else() ...@@ -13,7 +13,8 @@ else()
target_compile_definitions(fggl PUBLIC ${BULLET_DEFINITIONS}) target_compile_definitions(fggl PUBLIC ${BULLET_DEFINITIONS})
if ( BULLET_INCLUDE_DIRS STREQUAL "include/bullet" ) 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}) target_include_directories(fggl PUBLIC ${BULLET_ROOT_DIR}/${BULLET_INCLUDE_DIRS})
else() else()
target_include_directories(fggl PUBLIC ${BULLET_INCLUDE_DIRS}) target_include_directories(fggl PUBLIC ${BULLET_INCLUDE_DIRS})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment