Require YARP 3.0+ and YCM 0.10+, remove workaround

* roboticslab-uc3m/questions-and-answers#83 * roboticslab-uc3m/questions-and-answers#78
roboticslab-uc3m · May 13, 2019 · ec3cd90 · ec3cd90
1 parent c1c5234
commit ec3cd90
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,13 +4,8 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 project(AMOR_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(amor)

diff --git a/doc/amor-openrave-models-install.md b/doc/amor-openrave-models-install.md
@@ -3,8 +3,8 @@
 Dependencies:
 
 - [Install CMake 3.5+](https://github.com/roboticslab-uc3m/installation-guides/blob/develop/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/develop/install-yarp.md) (CMake modules)
+- [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/develop/install-yarp.md) (CMake modules)
 
 Installation steps: