From 2111b6414eea667b290b2ab086b67fc9f3a5cec0 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 8 Jul 2021 18:00:28 +0200 Subject: [PATCH 1/8] Create Buildidyntree-yarp-tools.cmake --- cmake/Buildidyntree-yarp-tools.cmake | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 cmake/Buildidyntree-yarp-tools.cmake diff --git a/cmake/Buildidyntree-yarp-tools.cmake b/cmake/Buildidyntree-yarp-tools.cmake new file mode 100644 index 000000000..f196e021f --- /dev/null +++ b/cmake/Buildidyntree-yarp-tools.cmake @@ -0,0 +1,22 @@ +# 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) + +set(idyntree-yarp-tools_CONDA_DEPENDENCIES eigen qt) From 3f77a51a129aa2da5dfe173f5ea76c22c71f15e0 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 8 Jul 2021 18:02:38 +0200 Subject: [PATCH 2/8] Update BuildiDynTree.cmake --- cmake/BuildiDynTree.cmake | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/cmake/BuildiDynTree.cmake b/cmake/BuildiDynTree.cmake index 19409a7c8..10301acb2 100644 --- a/cmake/BuildiDynTree.cmake +++ b/cmake/BuildiDynTree.cmake @@ -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 @@ -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) From 5a796b5c301c6da7d73105dbe284f2d1455ca615 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 8 Jul 2021 18:03:18 +0200 Subject: [PATCH 3/8] Update RobotologySuperbuildLogic.cmake --- cmake/RobotologySuperbuildLogic.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/RobotologySuperbuildLogic.cmake b/cmake/RobotologySuperbuildLogic.cmake index 902b07b18..0d30c175d 100644 --- a/cmake/RobotologySuperbuildLogic.cmake +++ b/cmake/RobotologySuperbuildLogic.cmake @@ -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) From 48edf39e24f0861542c7009d306d8fe6d9b1ac83 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 8 Jul 2021 18:06:05 +0200 Subject: [PATCH 4/8] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08df71ea4..2bc08c072 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From 1c8215529e59ba22b2704c639598bb0f926cc937 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 8 Jul 2021 18:53:42 +0200 Subject: [PATCH 5/8] Bump iDynTree and add idyntree-yarp-tools release --- releases/latest.releases.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/releases/latest.releases.yaml b/releases/latest.releases.yaml index 8602b4716..137a4fcf3 100644 --- a/releases/latest.releases.yaml +++ b/releases/latest.releases.yaml @@ -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 @@ -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.1 From dd50ede2a03da96f4131f03c18731fa907e68602 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 8 Jul 2021 22:24:13 +0200 Subject: [PATCH 6/8] Update Buildhuman-dynamics-estimation.cmake --- cmake/Buildhuman-dynamics-estimation.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/Buildhuman-dynamics-estimation.cmake b/cmake/Buildhuman-dynamics-estimation.cmake index 4b7609540..8b626ed2b 100644 --- a/cmake/Buildhuman-dynamics-estimation.cmake +++ b/cmake/Buildhuman-dynamics-estimation.cmake @@ -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) @@ -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) From a06cc42a0cb900031bd40320636be46eca1bcc79 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 9 Jul 2021 11:25:44 +0200 Subject: [PATCH 7/8] Update Buildidyntree-yarp-tools.cmake --- cmake/Buildidyntree-yarp-tools.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/Buildidyntree-yarp-tools.cmake b/cmake/Buildidyntree-yarp-tools.cmake index f196e021f..3f1254459 100644 --- a/cmake/Buildidyntree-yarp-tools.cmake +++ b/cmake/Buildidyntree-yarp-tools.cmake @@ -17,6 +17,7 @@ ycm_ep_helper(idyntree-yarp-tools TYPE GIT YARP ICUB CMAKE_ARGS -DIDYNTREE_YARP_TOOLS_USES_ICUB_MAIN:BOOL=ON - -DIDYNTREE_YARP_TOOLS_USES_QT: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) From 3b6b8a6f03cb75957ddb369081f3689fad456abd Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 9 Jul 2021 11:25:56 +0200 Subject: [PATCH 8/8] Update latest.releases.yaml --- releases/latest.releases.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/latest.releases.yaml b/releases/latest.releases.yaml index 137a4fcf3..defb03588 100644 --- a/releases/latest.releases.yaml +++ b/releases/latest.releases.yaml @@ -206,4 +206,4 @@ repositories: idyntree-yarp-tools: type: git url: https://github.com/robotology/idyntree-yarp-tools.git - version: v0.0.1 + version: v0.0.2