From c8de1750e882af2d343f6fa1a5d33eeeca6b4c47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20=C5=81ukawski?= Date: Mon, 13 May 2019 16:49:41 +0200 Subject: [PATCH] Require YARP 3.0+ and YCM 0.10+, remove workaround https://github.com/roboticslab-uc3m/questions-and-answers/issues/83 --- CMakeLists.txt | 9 ++------- doc/teo-openrave-models-install.md | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 54c87cd..3dacfb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,13 +8,8 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) project(TEO_OPENRAVE_MODELS LANGUAGES NONE) # Find dependencies. -find_package(YCM 0.8 REQUIRED) - -# https://github.com/roboticslab-uc3m/questions-and-answers/issues/65 -find_package(YARP 3.0 QUIET) -if(NOT YARP_FOUND) - find_package(YARP 2.3.70 REQUIRED) -endif() +find_package(YCM 0.10 REQUIRED) +find_package(YARP 3.0 REQUIRED) # Set some useful variables - paths relative to the installation prefix. yarp_configure_external_installation(teo-openrave-models) diff --git a/doc/teo-openrave-models-install.md b/doc/teo-openrave-models-install.md index 9237de9..b8ba622 100644 --- a/doc/teo-openrave-models-install.md +++ b/doc/teo-openrave-models-install.md @@ -3,8 +3,8 @@ First install the dependencies: - [Install CMake 3.5+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-cmake.md) -- [Install YCM 0.8+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-ycm.md) -- [Install YARP 2.3.70+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-yarp.md) +- [Install YCM 0.10+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-ycm.md) +- [Install YARP 3.0+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-yarp.md) ### Install the Models