From e1dfa44ab6d6d327a14290dc084cfa28944e47a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20=C5=81ukawski?= Date: Mon, 13 May 2019 17:18:53 +0200 Subject: [PATCH] Require YARP 3.0+, remove workaround https://github.com/roboticslab-uc3m/questions-and-answers/issues/83 --- .travis.yml | 2 -- .travis.yml.generate | 2 -- CMakeLists.txt | 6 +----- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2191552..09ef1ab 100644 --- 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 index 50fd315..bf2ad7d 100644 --- 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 index 7bbcb61..b924cb0 100644 --- 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.