Require YARP 3.0+, remove workaround

roboticslab-uc3m/questions-and-answers#83
roboticslab-uc3m · May 15, 2019 · 85e2f75 · 85e2f75
1 parent ae07c15
commit 85e2f75
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 20 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
@@ -38,13 +38,8 @@ 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 sig
+                               OPTIONAL_COMPONENTS math)
 find_package(COLOR_DEBUG REQUIRED)
 
 # Soft dependencies.

diff --git a/doc/kinematics-dynamics-install.md b/doc/kinematics-dynamics-install.md
@@ -4,7 +4,7 @@ First install the dependencies:
 
 - [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 KDL 1.4+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-kdl.md/)
 - [Install color-debug](https://github.com/roboticslab-uc3m/color-debug)
 

diff --git a/examples/cpp/exampleCartesianControlClient/CMakeLists.txt b/examples/cpp/exampleCartesianControlClient/CMakeLists.txt
@@ -1,9 +1,9 @@
-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 # Start a project.
-project(exampleCartesianControlClient)
+project(exampleCartesianControlClient LANGUAGES CXX)
 
-find_package(YARP REQUIRED)
+find_package(YARP 3.0 REQUIRED COMPONENTS OS dev)
 find_package(ROBOTICSLAB_KINEMATICS_DYNAMICS REQUIRED)
 
 # Set up our main executable.

diff --git a/examples/cpp/exampleScrewTheoryTrajectory/CMakeLists.txt b/examples/cpp/exampleScrewTheoryTrajectory/CMakeLists.txt
@@ -1,9 +1,9 @@
-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 # Start a project.
-project(exampleScrewTheoryTrajectory)
+project(exampleScrewTheoryTrajectory LANGUAGES CXX)
 
-find_package(YARP REQUIRED)
+find_package(YARP 3.0 REQUIRED COMPONENTS OS dev)
 find_package(COLOR_DEBUG REQUIRED)
 find_package(orocos_kdl 1.4 QUIET)
 find_package(ROBOTICSLAB_KINEMATICS_DYNAMICS REQUIRED)

diff --git a/examples/cpp/exampleYarpTinyMath/CMakeLists.txt b/examples/cpp/exampleYarpTinyMath/CMakeLists.txt
@@ -1,17 +1,17 @@
-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 # Start a project.
-project(exampleYarpTinyMath)
+project(exampleYarpTinyMath LANGUAGES CXX)
 
-find_package(YARP REQUIRED)
+find_package(YARP 3.0 REQUIRED COMPONENTS sig math)
 find_package(ROBOTICSLAB_KINEMATICS_DYNAMICS REQUIRED)
 
 # Set up our main executable.
 add_executable(exampleYarpTinyMath exampleYarpTinyMath.cpp)
 
 target_link_libraries(exampleYarpTinyMath YARP::YARP_sig
                                           YARP::YARP_math
-                                          YarpTinyMathLib)
+                                          ROBOTICSLAB::YarpTinyMathLib)
 
 include(GNUInstallDirs)