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.

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 idyntree-yarp-tools #818

Merged
merged 8 commits into from
Jul 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ The format of this document is based on [Keep a Changelog](https://keepachangelo
- Add `nlohmann-json` dependency to the superbuild (https://github.com/robotology/robotology-superbuild/pull/776).
- In `YARP`, all the `fake***` YARP devices are now enabled (https://github.com/robotology/robotology-superbuild/pull/797).
- `pybind11` has been added as dependency for the `ROBOTOLOGY_USES_PYTHON` option (https://github.com/robotology/robotology-superbuild/pull/800), to enable compilation of Python bindings of `manif` and `bipedal-locomotion-framework`.
- The `idyntree-yarp-tools` was added to the Dynamics component of the superbuild (https://github.com/robotology/robotology-superbuild/pull/818).

## [2021.05] - 2021-05-31

Expand Down
4 changes: 3 additions & 1 deletion cmake/Buildhuman-dynamics-estimation.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ include(YCMEPHelper)
include(FindOrBuildPackage)

find_or_build_package(YARP QUIET)
find_or_build_package(ICUB QUIET)
find_or_build_package(iDynTree QUIET)
find_or_build_package(wearables QUIET)
find_or_build_package(osqp QUIET)
Expand All @@ -21,6 +22,7 @@ ycm_ep_helper(human-dynamics-estimation TYPE GIT
YARP
wearables
osqp
OsqpEigen)
OsqpEigen
ICUB)

set(human-dynamics-estimation_CONDA_DEPENDENCIES eigen)
9 changes: 2 additions & 7 deletions cmake/BuildiDynTree.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,9 @@
include(YCMEPHelper)
include(FindOrBuildPackage)

find_or_build_package(YARP QUIET)
find_or_build_package(ICUB QUIET)
find_or_build_package(OsqpEigen QUIET)

set(iDynTree_DEPENDS "")
list(APPEND iDynTree_DEPENDS YARP)
list(APPEND iDynTree_DEPENDS ICUB)
list(APPEND iDynTree_DEPENDS OsqpEigen)

# For what regards Python installation, the options changes depending
Expand All @@ -32,17 +28,16 @@ ycm_ep_helper(iDynTree TYPE GIT
COMPONENT dynamics
FOLDER src
CMAKE_ARGS -DIDYNTREE_USES_IPOPT:BOOL=ON
-DIDYNTREE_USES_YARP:BOOL=ON
-DIDYNTREE_USES_ICUB_MAIN:BOOL=ON
-DIDYNTREE_USES_OSQPEIGEN:BOOL=ON
-DIDYNTREE_USES_IRRLICHT:BOOL=ON
-DIDYNTREE_USES_MATLAB:BOOL=${ROBOTOLOGY_USES_MATLAB}
-DIDYNTREE_USES_PYTHON:BOOL=${ROBOTOLOGY_USES_PYTHON}
-DIDYNTREE_USES_OCTAVE:BOOL=${ROBOTOLOGY_USES_OCTAVE}
-DIDYNTREE_COMPILES_YARP_TOOLS:BOOL=OFF
${iDynTree_OPTIONAL_CMAKE_ARGS}
DEPENDS ${iDynTree_DEPENDS})

set(iDynTree_CONDA_DEPENDENCIES libxml2 ipopt eigen qt irrlicht)
set(iDynTree_CONDA_DEPENDENCIES libxml2 ipopt eigen irrlicht)

if(ROBOTOLOGY_USES_PYTHON)
list(APPEND iDynTree_CONDA_DEPENDENCIES swig)
Expand Down
23 changes: 23 additions & 0 deletions cmake/Buildidyntree-yarp-tools.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Copyright (C) Fondazione Istituto Italiano di Tecnologia
# CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT

include(YCMEPHelper)

find_or_build_package(iDynTree QUIET)
find_or_build_package(YARP QUIET)
find_or_build_package(ICUB QUIET)

ycm_ep_helper(idyntree-yarp-tools TYPE GIT
STYLE GITHUB
REPOSITORY robotology/idyntree-yarp-tools.git
TAG main
COMPONENT dynamics
FOLDER src
DEPENDS iDynTree
YARP
ICUB
CMAKE_ARGS -DIDYNTREE_YARP_TOOLS_USES_ICUB_MAIN:BOOL=ON
-DIDYNTREE_YARP_TOOLS_USES_QT:BOOL=ON
-DIDYNTREE_YARP_TOOLS_USES_QT_CHARTS:BOOL=OFF)

set(idyntree-yarp-tools_CONDA_DEPENDENCIES eigen qt)
1 change: 1 addition & 0 deletions cmake/RobotologySuperbuildLogic.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ endif()
# Dynamics
if(ROBOTOLOGY_ENABLE_DYNAMICS)
find_or_build_package(iDynTree)
find_or_build_package(idyntree-yarp-tools)
find_or_build_package(qpOASES)
find_or_build_package(BlockFactory)
find_or_build_package(WBToolbox)
Expand Down
6 changes: 5 additions & 1 deletion releases/latest.releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ repositories:
iDynTree:
type: git
url: https://github.com/robotology/idyntree.git
version: v3.2.1
version: v3.3.0
BlockFactory:
type: git
url: https://github.com/robotology/blockfactory.git
Expand Down Expand Up @@ -203,3 +203,7 @@ repositories:
type: git
url: https://github.com/dic-iit/casadi-matlab-bindings.git
version: v3.5.5.1
idyntree-yarp-tools:
type: git
url: https://github.com/robotology/idyntree-yarp-tools.git
version: v0.0.2