Require YARP 3.0+, remove workaround

roboticslab-uc3m/questions-and-answers#83
asrob-uc3m · May 14, 2019 · f7bbef6 · f7bbef6
1 parent 0ff54e8
commit f7bbef6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -33,7 +33,7 @@ branches:
 init:
   # Dependency version tags
   - cmd: set ACE_LATEST=6.5.5
-  - cmd: set YCM_LATEST=0.10.1
+  - cmd: set YCM_LATEST=0.10.2
   - cmd: set YARP_LATEST=3.1.1
   - cmd: set GTEST_LATEST=1.8.1
 

diff --git a/.travis.yml b/.travis.yml
@@ -17,8 +17,6 @@ env:
     - YARP_CHECKOUT=master
     - YARP_CHECKOUT=v3.1.1
     - YARP_CHECKOUT=30dce54 # hotfix for v3.0.1
-    - YARP_CHECKOUT=v2.3.72.1
-    - YARP_CHECKOUT=v2.3.70.2
 
 matrix:
   include:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,11 +38,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake
 
 # Hard dependencies.
 find_package(YCM 0.10 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(YARP 3.0 REQUIRED COMPONENTS OS dev)
 find_package(COLOR_DEBUG REQUIRED)
 
 # Soft dependencies.

diff --git a/doc/yarp-devices-install.md b/doc/yarp-devices-install.md
@@ -10,7 +10,7 @@ Some dependencies must be installed for all the devices:
 
 - [Install CMake 3.5+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-cmake.md/)
 - [Install YCM 0.10+](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 YARP 3.0+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-yarp.md/)
 - [Install color-debug](https://github.com/roboticslab-uc3m/color-debug)
 
 ## Installation (Ubuntu)