Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CI with apt dependencies of Debian 10 Buster backports and fix build #1148

Merged
merged 5 commits into from
Jan 27, 2024
Merged

Add CI with apt dependencies of Debian 10 Buster backports and fix build #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c224a77
Add CI with Debian 10 Buster backports
traversaro Jan 16, 2024
5600cf2
Update CHANGELOG.md
traversaro Jan 16, 2024
a96258a
Fix compilation of IDYNTREE_USES_ASSIMP option in Debian Buster 10
traversaro Jan 16, 2024
c0c4f20
Install CMake 3.16 in Debian Buster
traversaro Jan 16, 2024
34a4d46
Fix outdated assimp-related CMake code
traversaro Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ jobs:
os:
- ubuntu-latest
docker_image:
- "debian:buster-backports"
- "ubuntu:20.04"
- "ubuntu:22.04"

Expand All @@ -183,6 +184,11 @@ jobs:
git build-essential cmake libace-dev coinor-libipopt-dev libeigen3-dev swig \
libxml2-dev liboctave-dev python3-dev python3-numpy valgrind libassimp-dev libirrlicht-dev curl unzip libglfw3-dev

- name: Install CMake 3.16 [Docker/Debian Buster]
if: matrix.docker_image == 'debian:buster-backports'
run: |
apt-get -y -t buster-backports install cmake

- name: Install files to enable compilation of mex files [apt]
run: |
curl -L -O https://github.com/robotology/robotology-vcpkg-ports/releases/download/storage/msdk_R2020b_mexa64.zip
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- Fixed compilation of IDYNTREE_USES_ASSIMP option in Debian 10 Buster (https://github.com/robotology/idyntree/pull/1148).

## [10.2.0] - 2024-01-12

### Added
Expand Down
12 changes: 9 additions & 3 deletions src/visualization/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,19 @@ if(IDYNTREE_USES_MESHCATCPP)
target_link_libraries(${libraryname} PRIVATE MeshcatCpp::MeshcatCpp)
endif()

if(IDYNTREE_USES_ASSIMP)
target_compile_definitions(${libraryname} PRIVATE IDYNTREE_USES_ASSIMP)
if (IDYNTREE_USES_ASSIMP)
target_compile_definitions(${libraryname} PRIVATE IDYNTREE_USES_ASSIMP)
# See similar code in solid-shapes CMakeLists.txt
if((assimp_VERSION AND assimp_VERSION VERSION_GREATER_EQUAL 5.0) OR WIN32)
target_link_libraries(${libraryname} PRIVATE assimp::assimp)
else()
target_include_directories(${libraryname} PRIVATE "${ASSIMP_INCLUDE_DIRS}")
link_directories("${ASSIMP_LIBRARY_DIRS}")
target_link_libraries(${libraryname} PRIVATE "${ASSIMP_LIBRARIES}")
endif()
endif()



install(TARGETS ${libraryname}
EXPORT iDynTree
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
Expand Down
Loading