Skip to content

Commit 51d5c74

Browse files
authored
Enable the IDYNTREE_USES_IRRLICHT option in pip/PyPI builds (#1045)
1 parent 7ecf7b5 commit 51d5c74

File tree

6 files changed

+17
-9
lines changed

6 files changed

+17
-9
lines changed

.github/workflows/gh-pages.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ jobs:
1313

1414
- uses: conda-incubator/setup-miniconda@v2
1515
with:
16-
mamba-version: "*"
17-
channels: conda-forge
18-
channel-priority: true
16+
miniforge-variant: Mambaforge
17+
miniforge-version: latest
1918

2019
- name: Dependencies [apt]
2120
shell: bash -l {0}

.github/workflows/python.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ jobs:
4444
libeigen3-dev \
4545
swig \
4646
libxml2-dev \
47-
libassimp-dev
47+
libassimp-dev \
48+
libirrlicht-dev
4849
pip install build
4950
5051
- name: Build sdist
@@ -96,7 +97,7 @@ jobs:
9697
CIBW_ENVIRONMENT_LINUX: AUDITWHEEL_PLAT=manylinux_2_24_x86_64
9798
CIBW_BEFORE_BUILD_LINUX: |
9899
apt-get update &&\
99-
apt-get install -y libeigen3-dev libassimp-dev libxml2-dev coinor-libipopt-dev
100+
apt-get install -y libeigen3-dev libassimp-dev libxml2-dev coinor-libipopt-dev libirrlicht-dev
100101
CIBW_TEST_COMMAND: "python -c 'import idyntree.bindings'"
101102

102103
- uses: actions/upload-artifact@v2

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88

99
## [Unreleased]
1010

11+
## [8.1.0] - 2023-01-16
12+
13+
### Added
14+
- Enabled the use of irrlicht dependency in PyPI builds (https://github.com/robotology/idyntree/pull/1045).
15+
16+
1117
## [8.0.1] - 2023-01-10
1218

1319
### Fix

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
cmake_minimum_required(VERSION 3.16)
1010

11-
project(iDynTree VERSION 8.0.1
11+
project(iDynTree VERSION 8.1.0
1212
LANGUAGES C CXX)
1313

1414
# Disable in source build, unless Eclipse is used

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"-DIDYNTREE_PACKAGE_FOR_PYPI:BOOL=ON",
2323
"-DIDYNTREE_USES_IPOPT:BOOL=ON",
2424
"-DIDYNTREE_USES_ASSIMP:BOOL=ON",
25-
"-DIDYNTREE_USES_IRRLICHT:BOOL=OFF",
25+
"-DIDYNTREE_USES_IRRLICHT:BOOL=ON",
2626
"-DIDYNTREE_USES_OSQPEIGEN:BOOL=OFF",
2727
"-DIDYNTREE_USES_ALGLIB:BOOL=OFF",
2828
"-DIDYNTREE_USES_WORHP:BOOL=OFF",

src/visualization/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,10 @@ if(IDYNTREE_USES_IRRLICHT)
7373
find_package(OpenGL)
7474
find_package(Irrlicht REQUIRED)
7575

76-
target_include_directories(${libraryname} PRIVATE SYSTEM ${OPENGL_INCLUDE_DIR})
77-
target_link_libraries(${libraryname} PRIVATE Irrlicht::Irrlicht ${OPENGL_LIBRARIES})
76+
target_link_libraries(${libraryname} PRIVATE Irrlicht::Irrlicht)
77+
if(TARGET OpenGL::GL)
78+
target_link_libraries(${libraryname} PRIVATE OpenGL::GL)
79+
endif()
7880
if(MSVC)
7981
add_definitions(-D_USE_MATH_DEFINES)
8082
endif()

0 commit comments

Comments
 (0)