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

Fix dependencies issues in the cmake machinery #414

Merged
merged 4 commits into from
Sep 16, 2021
Merged

Fix dependencies issues in the cmake machinery #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
786d876
Fix dependencies issues in the cmake machinery
GiulioRomualdi Sep 16, 2021
90b9327
Update the CHANGELOG
GiulioRomualdi Sep 16, 2021
3e1e105
Add nlohmann_json to CI missing dependencies test
GiulioRomualdi Sep 16, 2021
a533dfa
Remove pybind11 vcpkg installation in Windows CI
GiulioRomualdi Sep 16, 2021
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: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ jobs:
cd C:/robotology/vcpkg
./vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports install catch2:x64-windows

# Install pybind11 and tomlplusplus
./vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports install pybind11:x64-windows tomlplusplus:x64-windows
# Install tomlplusplus
./vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports install tomlplusplus:x64-windows

- name: Dependencies [macOS]
if: matrix.os == 'macos-latest'
Expand Down Expand Up @@ -484,7 +484,7 @@ jobs:
shell: bash
run: |
cd build
for missing_dep in YARP Qhull casadi cppad manif Python3 pybind11 pytest matioCpp LieGroupControllers; do
for missing_dep in YARP Qhull casadi cppad manif Python3 pybind11 pytest matioCpp LieGroupControllers nlohmann_json; do
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spdlog is also missing?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spdlog is a mandatory dependency :)

echo "Testing ${missing_dep} as missing dependency."
# Deselect missing dependency and build
cmake -DFRAMEWORK_USE_${missing_dep}:BOOL=OFF .
Expand Down
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 @@ -12,6 +12,7 @@ All notable changes to this project are documented in this file.
- Add `name` parameter to the `AdvanceableRunner` class (https://github.com/dic-iit/bipedal-locomotion-framework/pull/406)

### Fix
- Fix missing components dependencies in the `CMake` machinery (https://github.com/ami-iit/bipedal-locomotion-framework/pull/414)

## [0.3.0] - 2021-08-12
### Added
Expand Down
10 changes: 5 additions & 5 deletions cmake/BipedalLocomotionFrameworkDependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ framework_dependent_option(FRAMEWORK_COMPILE_Contact

framework_dependent_option(FRAMEWORK_COMPILE_Planners
"Compile Planners libraries?" ON
"FRAMEWORK_USE_Qhull;FRAMEWORK_USE_casadi;FRAMEWORK_USE_manif;FRAMEWORK_COMPILE_Math" OFF)
"FRAMEWORK_USE_Qhull;FRAMEWORK_USE_casadi;FRAMEWORK_USE_manif;FRAMEWORK_COMPILE_Math;FRAMEWORK_COMPILE_Contact" OFF)

framework_dependent_option(FRAMEWORK_COMPILE_ContactModels
"Compile ContactModels library?" ON
Expand All @@ -142,7 +142,7 @@ framework_dependent_option(FRAMEWORK_COMPILE_RobotInterface

framework_dependent_option(FRAMEWORK_COMPILE_FloatingBaseEstimators
"Compile FloatingBaseEstimators libraries?" ON
"FRAMEWORK_USE_manif" OFF)
"FRAMEWORK_USE_manif;FRAMEWORK_COMPILE_Contact" OFF)

framework_dependent_option(FRAMEWORK_COMPILE_ManifConversions
"Compile manif Conversions libraries?" ON
Expand All @@ -154,7 +154,7 @@ framework_dependent_option(FRAMEWORK_COMPILE_matioCppConversions

framework_dependent_option(FRAMEWORK_COMPILE_TSID
"Compile TSID library?" ON
"FRAMEWORK_COMPILE_System;FRAMEWORK_USE_LieGroupControllers;FRAMEWORK_COMPILE_ManifConversions;FRAMEWORK_USE_manif" OFF)
"FRAMEWORK_COMPILE_System;FRAMEWORK_USE_LieGroupControllers;FRAMEWORK_COMPILE_ManifConversions;FRAMEWORK_USE_manif;FRAMEWORK_COMPILE_Contact" OFF)

framework_dependent_option(FRAMEWORK_COMPILE_IK
"Compile IK library?" ON
Expand All @@ -166,7 +166,7 @@ framework_dependent_option(FRAMEWORK_COMPILE_SimplifiedModelControllers

framework_dependent_option(FRAMEWORK_COMPILE_JointPositionTrackingApplication
"Compile joint-position-tracking application?" ON
"FRAMEWORK_COMPILE_YarpImplementation;FRAMEWORK_COMPILE_Planners;FRAMEWORK_COMPILE_RobotInterface" OFF)
"FRAMEWORK_COMPILE_YarpImplementation;FRAMEWORK_COMPILE_Planners;FRAMEWORK_COMPILE_RobotInterface;FRAMEWORK_COMPILE_Contact" OFF)

framework_dependent_option(FRAMEWORK_COMPILE_PYTHON_BINDINGS
"Do you want to generate and compile the Python bindings?" ON
Expand All @@ -182,7 +182,7 @@ framework_dependent_option(FRAMEWORK_COMPILE_MasImuTest

framework_dependent_option(FRAMEWORK_COMPILE_JointTrajectoryPlayer
"Compile joint-trajectory-player application?" ON
"FRAMEWORK_COMPILE_YarpImplementation;FRAMEWORK_COMPILE_Planners;FRAMEWORK_COMPILE_RobotInterface;FRAMEWORK_COMPILE_matioCppConversions;FRAMEWORK_USE_matioCpp;FRAMEWORK_USE_YARP" OFF)
"FRAMEWORK_COMPILE_YarpImplementation;FRAMEWORK_COMPILE_Planners;FRAMEWORK_COMPILE_RobotInterface;FRAMEWORK_COMPILE_matioCppConversions;FRAMEWORK_USE_matioCpp;FRAMEWORK_USE_YARP;FRAMEWORK_COMPILE_Contact" OFF)

framework_dependent_option(FRAMEWORK_COMPILE_Perception
"Compile Perception libraries?" ON
Expand Down