Require YARP 2.3.70

#180 (comment)
roboticslab-uc3m · May 17, 2018 · f929b89 · f929b89
1 parent f6b0486
commit f929b89
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -82,14 +82,7 @@ set_property(GLOBAL PROPERTY ROBOTICSLAB_YARP_DEVICES_TARGETS)
 include(CMakeDependentOption)
 
 # Find YARP (main dependency).
-find_package(YARP REQUIRED)
-
-# Load YARP modules.
-if(YARP_VERSION_SHORT VERSION_LESS 2.3.70)
-    list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
-    include(YarpPlugin)
-    include(YarpInstallationHelpers)
-endif()
+find_package(YARP 2.3.70 REQUIRED)
 
 # Configure installation paths for YARP resources.
 yarp_configure_external_installation(roboticslab-yarp-devices WITH_PLUGINS)

diff --git a/libraries/OneCanBusOneWrapper/CMakeLists.txt b/libraries/OneCanBusOneWrapper/CMakeLists.txt
@@ -2,8 +2,6 @@ option(ENABLE_OneCanBusOneWrapper "Enable/disable OneCanBusOneWrapper library" O
 
 if(ENABLE_OneCanBusOneWrapper)
 
-include_directories(${YARP_INCLUDE_DIRS}) # remove if YARP > v2.3.70
-
 add_library(OneCanBusOneWrapper OneCanBusOneWrapper.cpp
                                 OneCanBusOneWrapper.hpp)
 

diff --git a/libraries/TwoCanBusThreeWrappers/CMakeLists.txt b/libraries/TwoCanBusThreeWrappers/CMakeLists.txt
@@ -2,8 +2,6 @@ option(ENABLE_TwoCanBusThreeWrappers "Enable/disable TwoCanBusThreeWrappers libr
 
 if(ENABLE_TwoCanBusThreeWrappers)
 
-include_directories(${YARP_INCLUDE_DIRS}) # remove if YARP > v2.3.70
-
 add_library(TwoCanBusThreeWrappers TwoCanBusThreeWrappers.cpp
                                    TwoCanBusThreeWrappers.hpp)
 

diff --git a/libraries/YarpPlugins/CMakeLists.txt b/libraries/YarpPlugins/CMakeLists.txt
@@ -2,10 +2,6 @@
 # Authors: Juan G. Victores & Raul de Santos Rico
 # CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
 
-if(YARP_VERSION_SHORT VERSION_LESS 2.3.70)
-    include_directories(${YARP_INCLUDE_DIRS})
-endif()
-
 # Create device interface target.
 add_library(YarpDevicesInterfaces INTERFACE)
 

diff --git a/programs/checkCanBus/CMakeLists.txt b/programs/checkCanBus/CMakeLists.txt
@@ -2,8 +2,6 @@ option(ENABLE_checkCanBus "Enable/disable checkCanBus program" ON)
 
 if(ENABLE_checkCanBus)
 
-include_directories(${YARP_INCLUDE_DIRS}) # remove if YARP > v2.3.70
-
 add_executable(checkCanBus main.cpp
                            CheckCanBus.cpp
                            CheckCanBus.hpp

diff --git a/programs/dumpCanBus/CMakeLists.txt b/programs/dumpCanBus/CMakeLists.txt
@@ -2,8 +2,6 @@ option(ENABLE_dumpCanBus "Enable/disable dumpCanBus program" ON)
 
 if(ENABLE_dumpCanBus)
 
-include_directories(${YARP_INCLUDE_DIRS}) # remove if YARP > v2.3.70
-
 add_executable(dumpCanBus main.cpp
                           DumpCanBus.cpp
                           DumpCanBus.hpp

diff --git a/programs/launchLocomotion/CMakeLists.txt b/programs/launchLocomotion/CMakeLists.txt
@@ -3,8 +3,6 @@ cmake_dependent_option(ENABLE_launchLocomotion "Enable/disable launchLocomotion
 
 if(ENABLE_launchLocomotion)
 
-include_directories(${YARP_INCLUDE_DIRS}) # remove if YARP > v2.3.70
-
 add_executable(launchLocomotion main.cpp)
 
 add_dependencies(launchLocomotion COLOR_DEBUG)

diff --git a/programs/launchManipulation/CMakeLists.txt b/programs/launchManipulation/CMakeLists.txt
@@ -3,8 +3,6 @@ cmake_dependent_option(ENABLE_launchManipulation "Enable/disable launchManipulat
 
 if(ENABLE_launchManipulation)
 
-include_directories(${YARP_INCLUDE_DIRS}) # remove if YARP > v2.3.70
-
 add_executable(launchManipulation main.cpp)
 
 add_dependencies(launchManipulation COLOR_DEBUG)

diff --git a/programs/oneCanBusOneWrapper/CMakeLists.txt b/programs/oneCanBusOneWrapper/CMakeLists.txt
@@ -3,8 +3,6 @@ cmake_dependent_option(ENABLE_oneCanBusOneWrapper "Enable/disable oneCanBusOneWr
 
 if(ENABLE_oneCanBusOneWrapper)
 
-include_directories(${YARP_INCLUDE_DIRS}) # remove if YARP > v2.3.70
-
 add_executable(oneCanBusOneWrapper main.cpp)
 
 add_dependencies(oneCanBusOneWrapper COLOR_DEBUG)

diff --git a/tests/testCuiAbsolute/CMakeLists.txt b/tests/testCuiAbsolute/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${YARP_INCLUDE_DIRS}) # remove if YARP > v2.3.70
-
 add_executable(testCuiAbsolute testCuiAbsolute.cpp)
 
 add_dependencies(testCuiAbsolute COLOR_DEBUG)

diff --git a/tests/testTechnosoftIpos/CMakeLists.txt b/tests/testTechnosoftIpos/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${YARP_INCLUDE_DIRS}) # remove if YARP > v2.3.70
-
 add_executable(testTechnosoftIpos testTechnosoftIpos.cpp)
 
 add_dependencies(testTechnosoftIpos COLOR_DEBUG)