Require YARP 3.0+, remove workaround

roboticslab-uc3m/questions-and-answers#83
roboticslab-uc3m · May 13, 2019 · e1dfa44 · e1dfa44
1 parent 3a52052
commit e1dfa44
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,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/.travis.yml.generate b/.travis.yml.generate
@@ -13,8 +13,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
@@ -15,11 +15,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)
 find_package(COLOR_DEBUG REQUIRED)
 
 # Soft dependencies.