From 1f36d0bd04ec12166fb336cbd84f531ce80ee975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20=C5=81ukawski?= Date: Fri, 17 May 2024 17:36:48 +0200 Subject: [PATCH] Bump to YARP 3.8+ --- CMakeLists.txt | 8 ++------ doc/yarp-devices-install.md | 4 ++-- examples/cpp/exampleRobotClient/CMakeLists.txt | 4 ++-- .../YarpPlugins/FakeMotorController/DeviceDriverImpl.cpp | 6 ------ libraries/YarpPlugins/RobotServer/DeviceDriverImpl.cpp | 1 - 5 files changed, 6 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57b0ce7..327789e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,4 @@ -# Copyright: Universidad Carlos III de Madrid (C) 2013; -# Authors: Juan G. Victores & Raúl de Santos Rico -# CopyPolicy: Released under the terms of the GNU GPL v2.0. - -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.16) # Honor wiringPi_ROOT env variable in FindwiringPi.cmake (CMake 3.12). if(POLICY CMP0074) @@ -43,7 +39,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake # Hard dependencies. find_package(YCM 0.11 REQUIRED) -find_package(YARP 3.5 REQUIRED COMPONENTS os dev) +find_package(YARP 3.8 REQUIRED COMPONENTS os dev) # Soft dependencies. find_package(wiringPi QUIET) diff --git a/doc/yarp-devices-install.md b/doc/yarp-devices-install.md index fcf4a45..a581a94 100644 --- a/doc/yarp-devices-install.md +++ b/doc/yarp-devices-install.md @@ -8,9 +8,9 @@ This guide aims to simplify as much as possible the process of finding out which Some dependencies must be installed for all the devices: -- [Install CMake 3.12+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/docs/install-cmake.md/) +- [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.5+](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/) ## Installation (Ubuntu) diff --git a/examples/cpp/exampleRobotClient/CMakeLists.txt b/examples/cpp/exampleRobotClient/CMakeLists.txt index 800866f..d2cebdf 100644 --- a/examples/cpp/exampleRobotClient/CMakeLists.txt +++ b/examples/cpp/exampleRobotClient/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.12 FATAL_ERROR) +cmake_minimum_required(VERSION 3.16) project(exampleRobotClient LANGUAGES CXX) if(NOT YARP_FOUND) - find_package(YARP 3.3 REQUIRED COMPONENTS os dev) + find_package(YARP 3.8 REQUIRED COMPONENTS os dev) endif() if(NOT TARGET ASROB::RobotInterfaces) diff --git a/libraries/YarpPlugins/FakeMotorController/DeviceDriverImpl.cpp b/libraries/YarpPlugins/FakeMotorController/DeviceDriverImpl.cpp index 3592b3c..a2c256f 100644 --- a/libraries/YarpPlugins/FakeMotorController/DeviceDriverImpl.cpp +++ b/libraries/YarpPlugins/FakeMotorController/DeviceDriverImpl.cpp @@ -4,8 +4,6 @@ #include "FakeMotorController.hpp" -#include - #include #include "LogComponent.hpp" @@ -14,10 +12,6 @@ using namespace asrob; bool FakeMotorController::open(yarp::os::Searchable& config) { -#if !defined(YARP_VERSION_COMPARE) // < 3.6.0 - yCDebug(FMC) << "Config:" << config.toString(); -#endif - if (config.check("dummy", "check dummy option")) { yCInfo(FMC) << "Got dummy option"; diff --git a/libraries/YarpPlugins/RobotServer/DeviceDriverImpl.cpp b/libraries/YarpPlugins/RobotServer/DeviceDriverImpl.cpp index 445e10f..59c0d05 100644 --- a/libraries/YarpPlugins/RobotServer/DeviceDriverImpl.cpp +++ b/libraries/YarpPlugins/RobotServer/DeviceDriverImpl.cpp @@ -27,7 +27,6 @@ bool RobotServer::open(yarp::os::Searchable& config) yarp::os::Property p; p.fromString(config.toString()); p.put("device", name->toString()); - p.setMonitor(config.getMonitor(), name->toString().c_str()); robotDevice.open(p); } else