From 1ac12a90a96753eb31c8a0d0790a1ba05b6457c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20=C5=81ukawski?= Date: Sat, 16 Nov 2024 17:53:52 +0100 Subject: [PATCH] Bump to YARP 3.9+ --- .github/workflows/ci.yml | 2 +- CMakeLists.txt | 4 ++-- doc/kinematics-dynamics-install.md | 4 +--- examples/cpp/exampleCartesianControlClient/CMakeLists.txt | 2 +- examples/cpp/exampleScrewTheoryTrajectory/CMakeLists.txt | 2 +- examples/cpp/exampleYarpTinyMath/CMakeLists.txt | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3fe55e7c..e0a4f03f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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++ } diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c761abbc..484c98b15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) @@ -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. diff --git a/doc/kinematics-dynamics-install.md b/doc/kinematics-dynamics-install.md index c6c623fb6..7241139ed 100644 --- a/doc/kinematics-dynamics-install.md +++ b/doc/kinematics-dynamics-install.md @@ -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) diff --git a/examples/cpp/exampleCartesianControlClient/CMakeLists.txt b/examples/cpp/exampleCartesianControlClient/CMakeLists.txt index 743f7baf7..1a99fde87 100644 --- a/examples/cpp/exampleCartesianControlClient/CMakeLists.txt +++ b/examples/cpp/exampleCartesianControlClient/CMakeLists.txt @@ -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) diff --git a/examples/cpp/exampleScrewTheoryTrajectory/CMakeLists.txt b/examples/cpp/exampleScrewTheoryTrajectory/CMakeLists.txt index 7eeb94ea3..c2b403261 100644 --- a/examples/cpp/exampleScrewTheoryTrajectory/CMakeLists.txt +++ b/examples/cpp/exampleScrewTheoryTrajectory/CMakeLists.txt @@ -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) diff --git a/examples/cpp/exampleYarpTinyMath/CMakeLists.txt b/examples/cpp/exampleYarpTinyMath/CMakeLists.txt index bcc0875e5..1f025e5b6 100644 --- a/examples/cpp/exampleYarpTinyMath/CMakeLists.txt +++ b/examples/cpp/exampleYarpTinyMath/CMakeLists.txt @@ -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)