From d9e038b6bf160de63b2bebe4f13d153ebbbace8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20=C5=81ukawski?= Date: Thu, 23 May 2024 12:20:01 +0200 Subject: [PATCH] Bump to YARP 3.8+ --- .github/workflows/ci.yml | 6 +++--- CMakeLists.txt | 2 +- doc/amor-yarp-devices-install.md | 2 +- .../YarpPlugins/AmorCartesianControl/DeviceDriverImpl.cpp | 2 -- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ecdef9a..98b3fab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,9 +33,9 @@ jobs: matrix: os: [ubuntu-20.04, ubuntu-22.04] robotology: - - { yarp: yarp-3.7, cmake: 3.16.x } - { yarp: yarp-3.8, cmake: 3.16.x } - - { yarp: master, cmake: 3.16.x } + - { yarp: yarp-3.9, cmake: 3.16.x } + - { yarp: master, cmake: 3.19.x } compiler: - { cc: gcc, cxx: g++ } - { cc: clang, cxx: clang++ } @@ -84,7 +84,7 @@ jobs: run: sudo apt-get install -qq ccache libboost-thread-dev libeigen3-dev - name: Set up CMake - uses: jwlawson/actions-setup-cmake@v1 + uses: jwlawson/actions-setup-cmake@v2 with: cmake-version: ${{matrix.robotology.cmake}} diff --git a/CMakeLists.txt b/CMakeLists.txt index b06bffb..11b772a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake # Hard dependencies. find_package(YCM 0.11 REQUIRED) -find_package(YARP 3.7 REQUIRED COMPONENTS os dev) +find_package(YARP 3.8 REQUIRED COMPONENTS os dev) # Soft dependencies. find_package(AMOR_API QUIET) diff --git a/doc/amor-yarp-devices-install.md b/doc/amor-yarp-devices-install.md index baa89ab..0c03dd8 100644 --- a/doc/amor-yarp-devices-install.md +++ b/doc/amor-yarp-devices-install.md @@ -3,7 +3,7 @@ First install the dependencies: - [Install CMake 3.16+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/docs/install-cmake.md/) - [Install YCM 0.11+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/docs/install-ycm.md/) -- [Install YARP 3.7+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/docs/install-yarp.md/) +- [Install YARP 3.8+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/docs/install-yarp.md/) - [Install AMOR-API](https://github.com/roboticslab-uc3m/amor-api) (private) 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/). diff --git a/libraries/YarpPlugins/AmorCartesianControl/DeviceDriverImpl.cpp b/libraries/YarpPlugins/AmorCartesianControl/DeviceDriverImpl.cpp index 4426e80..45c16ef 100644 --- a/libraries/YarpPlugins/AmorCartesianControl/DeviceDriverImpl.cpp +++ b/libraries/YarpPlugins/AmorCartesianControl/DeviceDriverImpl.cpp @@ -4,8 +4,6 @@ #include -#include - #include #include #include