Skip to content

Commit

Permalink
Bump to YARP 3.8+
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterBowman committed May 17, 2024
1 parent 02dcc5b commit 1f36d0b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 17 deletions.
8 changes: 2 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions doc/yarp-devices-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions examples/cpp/exampleRobotClient/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

#include "FakeMotorController.hpp"

#include <yarp/conf/version.h>

#include <yarp/os/LogStream.h>

#include "LogComponent.hpp"
Expand All @@ -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";
Expand Down
1 change: 0 additions & 1 deletion libraries/YarpPlugins/RobotServer/DeviceDriverImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1f36d0b

Please sign in to comment.