Require YARP 3.0+, remove workaround

roboticslab-uc3m/questions-and-answers#83
roboticslab-uc3m · May 14, 2019 · a7eb165 · a7eb165
1 parent 255af0d
commit a7eb165
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 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/CMakeLists.txt b/CMakeLists.txt
@@ -37,11 +37,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 # Hard dependencies.
 find_package(YCM 0.10 REQUIRED)
-find_package(YARP 3.0 QUIET)
-# https://github.com/roboticslab-uc3m/questions-and-answers/issues/65
-if(NOT YARP_FOUND)
-    find_package(YARP 2.3.70 REQUIRED)
-endif()
+find_package(YARP 3.0 REQUIRED COMPONENTS OS dev sig)
 find_package(COLOR_DEBUG REQUIRED)
 
 # Soft dependencies.

diff --git a/doc/vision-install.md b/doc/vision-install.md
@@ -6,7 +6,7 @@
 - [Install PCL with VTK >= 5](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-pcl.md/)
 - [Install OpenNI2 & NiTE2](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-openni-nite.md/)
 - [Install YCM 0.10+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-ycm.md/)
-- [Install YARP 2.3.70+ and OpenNI2DeviceServer](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-yarp.md/)
+- [Install YARP 3.0+ and OpenNI2DeviceServer](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-yarp.md/)
 - [Install OpenCV](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-opencv.md/)
 - [Install color-debug](https://github.com/roboticslab-uc3m/color-debug)
 

diff --git a/programs/colorRegionDetection2D/CMakeLists.txt b/programs/colorRegionDetection2D/CMakeLists.txt
@@ -16,11 +16,11 @@ if(ENABLE_colorRegionDetection2D)
                                           ColorRegionDetection2D.hpp)
 
     target_link_libraries(colorRegionDetection2D YARP::YARP_OS
-                                               YARP::YARP_init
-                                               YARP::YARP_dev
-                                               YARP::YARP_sig
-                                               ${OpenCV_LIBS}
-                                               TravisLib)
+                                                 YARP::YARP_init
+                                                 YARP::YARP_dev
+                                                 YARP::YARP_sig
+                                                 ${OpenCV_LIBS}
+                                                 TravisLib)
 
     install(TARGETS colorRegionDetection2D
             DESTINATION ${CMAKE_INSTALL_BINDIR})