Skip to content

Commit

Permalink
Bump to YARP 3.9+
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterBowman committed Nov 16, 2024
1 parent af8b886 commit 1ac12a9
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ jobs:
matrix:
os: [ubuntu-22.04, ubuntu-24.04]
robotology:
- { yarp: yarp-3.8, cmake: 3.16.x }
- { yarp: yarp-3.9, cmake: 3.16.x }
- { yarp: yarp-3.10, cmake: 3.19.x }
- { yarp: master, cmake: 3.19.x }
compiler:
- { cc: gcc, cxx: g++ }
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.16...3.28)
cmake_minimum_required(VERSION 3.16...3.30)

project(ROBOTICSLAB_KINEMATICS_DYNAMICS LANGUAGES CXX)

Expand Down Expand Up @@ -26,7 +26,7 @@ endif()
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/find-modules)

# Hard dependencies.
find_package(YARP 3.8 REQUIRED COMPONENTS os dev sig
find_package(YARP 3.9 REQUIRED COMPONENTS os dev sig
OPTIONAL_COMPONENTS math)

# Soft dependencies.
Expand Down
4 changes: 1 addition & 3 deletions doc/kinematics-dynamics-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ First install the dependencies:

- [Install CMake 3.16+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-cmake.md/)
- [Install YCM 0.11+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-ycm.md/)
- [Install YARP 3.8+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-yarp.md/)
- [Install YARP 3.9+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-yarp.md/)
- [Install KDL 1.4+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-kdl.md/)

We optionally use the `ProximitySensorsClient` device from [yarp-devices](https://github.com/roboticslab-uc3m/yarp-devices) in the `haarDetectionController` app. Refer to its installation guide for instructions.

For unit testing, you'll need the googletest source package. Refer to [Install googletest](https://github.com/roboticslab-uc3m/installation-guides/blob/master/docs/install-googletest.md/).

## Install kinematics-dynamics on Ubuntu (working on all tested versions)
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/exampleCartesianControlClient/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16)
project(exampleCartesianControlClient LANGUAGES CXX)

if(NOT YARP_FOUND)
find_package(YARP 3.7 REQUIRED COMPONENTS os dev)
find_package(YARP 3.9 REQUIRED COMPONENTS os dev)
endif()

if(NOT TARGET ROBOTICSLAB::KinematicsDynamicsInterfaces)
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/exampleScrewTheoryTrajectory/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16)
project(exampleScrewTheoryTrajectory LANGUAGES CXX)

if(NOT YARP_FOUND)
find_package(YARP 3.7 REQUIRED COMPONENTS os dev)
find_package(YARP 3.9 REQUIRED COMPONENTS os dev)
endif()

if(NOT TARGET ROBOTICSLAB::ScrewTheoryLib)
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp/exampleYarpTinyMath/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16)
project(exampleYarpTinyMath LANGUAGES CXX)

if(NOT YARP_math_FOUND)
find_package(YARP 3.7 REQUIRED COMPONENTS sig math)
find_package(YARP 3.9 REQUIRED COMPONENTS sig math)
endif()

if(NOT TARGET ROBOTICSLAB::YarpTinyMathLib)
Expand Down

0 comments on commit 1ac12a9

Please sign in to comment.