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 dependency of walking-controllers on bipedal-locomotion-framework #1013

Merged
merged 3 commits into from
Feb 4, 2022
Merged

Add dependency of walking-controllers on bipedal-locomotion-framework #1013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
274afeb
Update Buildwalking-controllers.cmake
traversaro Feb 3, 2022
368a86f
Update RobotologySuperbuildLogic.cmake
traversaro Feb 3, 2022
336f6d3
Update CHANGELOG.md
traversaro Feb 3, 2022
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ The format of this document is based on [Keep a Changelog](https://keepachangelo
### Changed
- On Windows the option `ROBOTOLOGY_USES_ESDCAN` is now enabled when generating conda packages (https://github.com/robotology/robotology-superbuild/pull/935).
- For the YARP package, the compilation of the `usbCamera` device on Linux is enabled even if `ROBOTOLOGY_ENABLE_ICUB_HEAD` is `OFF` (https://github.com/robotology/robotology-superbuild/pull/989).
- `walking-controllers` now depends on `bipedal-locomotion-framework`, so it is now compiled if `ROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS` option is enabled (https://github.com/robotology/robotology-superbuild/pull/1013).

## [2021.11.1] - 2022-01-05

Expand Down
2 changes: 2 additions & 0 deletions cmake/Buildwalking-controllers.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ find_or_build_package(UnicyclePlanner QUIET)
find_or_build_package(OsqpEigen QUIET)
find_or_build_package(qpOASES QUIET)
find_or_build_package(ICUBcontrib QUIET)
find_or_build_package(bipedal-locomotion-framework QUIET)

set(walking-controllers_DEPENDS "")
list(APPEND walking-controllers_DEPENDS YARP)
Expand All @@ -21,6 +22,7 @@ list(APPEND walking-controllers_DEPENDS UnicyclePlanner)
list(APPEND walking-controllers_DEPENDS OsqpEigen)
list(APPEND walking-controllers_DEPENDS qpOASES)
list(APPEND walking-controllers_DEPENDS ICUBcontrib)
list(APPEND walking-controllers_DEPENDS bipedal-locomotion-framework)

ycm_ep_helper(walking-controllers TYPE GIT
STYLE GITHUB
Expand Down
2 changes: 1 addition & 1 deletion cmake/RobotologySuperbuildLogic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ if(ROBOTOLOGY_ENABLE_DYNAMICS)
find_or_build_package(osqp)
find_or_build_package(OsqpEigen)
find_or_build_package(UnicyclePlanner)
find_or_build_package(walking-controllers)
find_or_build_package(whole-body-estimators)
find_or_build_package(whole-body-controllers)
find_or_build_package(matioCpp)
Expand All @@ -62,6 +61,7 @@ if(ROBOTOLOGY_ENABLE_DYNAMICS)
endif()
if(ROBOTOLOGY_ENABLE_DYNAMICS_FULL_DEPS)
find_or_build_package(bipedal-locomotion-framework)
find_or_build_package(walking-controllers)
if(ROBOTOLOGY_USES_MATLAB)
find_or_build_package(casadi-matlab-bindings)
endif()
Expand Down