remove redundant YARP-related cmake directives

roboticslab-uc3m · Mar 23, 2018 · a6754ba · a6754ba
1 parent 4b4ff60
commit a6754ba
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 17 deletions.
diff --git a/libraries/OpenravePlugins/OpenraveYarpCoupled/CMakeLists.txt b/libraries/OpenravePlugins/OpenraveYarpCoupled/CMakeLists.txt
@@ -6,7 +6,6 @@ option(ENABLE_OpenraveYarpCoupled "Enable/disable OpenraveYarpCoupled" ON)
 if(ENABLE_OpenraveYarpCoupled)
 
 find_package(OpenRAVE REQUIRED)
-find_package(YARP REQUIRED)
 find_package(Boost ${OpenRAVE_Boost_VERSION} EXACT COMPONENTS iostreams python thread)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/libraries/OpenravePlugins/OpenraveYarpForceEstimator/CMakeLists.txt b/libraries/OpenravePlugins/OpenraveYarpForceEstimator/CMakeLists.txt
@@ -6,7 +6,6 @@ option(ENABLE_OpenraveYarpForceEstimator "Enable/disable OpenraveYarpForceEstima
 if(ENABLE_OpenraveYarpForceEstimator)
 
 find_package(OpenRAVE REQUIRED)
-find_package(YARP REQUIRED)
 find_package(Boost ${OpenRAVE_Boost_VERSION} EXACT COMPONENTS iostreams python thread)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/libraries/OpenravePlugins/OpenraveYarpPaintSquares/CMakeLists.txt b/libraries/OpenravePlugins/OpenraveYarpPaintSquares/CMakeLists.txt
@@ -6,7 +6,6 @@ option(ENABLE_OpenraveYarpPaintSquares "Enable/disable OpenraveYarpPaintSquares"
 if(ENABLE_OpenraveYarpPaintSquares)
 
 find_package(OpenRAVE REQUIRED)
-find_package(YARP REQUIRED)
 find_package(Boost ${OpenRAVE_Boost_VERSION} EXACT COMPONENTS iostreams python thread)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/libraries/OpenravePlugins/OpenraveYarpPluginLoader/CMakeLists.txt b/libraries/OpenravePlugins/OpenraveYarpPluginLoader/CMakeLists.txt
@@ -6,7 +6,6 @@ option(ENABLE_OpenraveYarpPluginLoader "Enable/disable OpenraveYarpPluginLoader"
 if(ENABLE_OpenraveYarpPluginLoader)
 
 find_package(OpenRAVE REQUIRED)
-find_package(YARP REQUIRED)
 find_package(Boost ${OpenRAVE_Boost_VERSION} EXACT COMPONENTS iostreams python thread)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/libraries/OpenravePlugins/OpenraveYarpWorldRpcResponder/CMakeLists.txt b/libraries/OpenravePlugins/OpenraveYarpWorldRpcResponder/CMakeLists.txt
@@ -6,7 +6,6 @@ option(ENABLE_OpenraveYarpWorldRpcResponder "Enable/disable OpenraveYarpWorldRpc
 if(ENABLE_OpenraveYarpWorldRpcResponder)
 
 find_package(OpenRAVE REQUIRED)
-find_package(YARP REQUIRED)
 find_package(Boost ${OpenRAVE_Boost_VERSION} EXACT COMPONENTS iostreams python thread)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/libraries/YarpOpenraveBase/CMakeLists.txt b/libraries/YarpOpenraveBase/CMakeLists.txt
@@ -5,7 +5,6 @@ option(ENABLE_YarpOpenraveBase "Enable/disable YarpOpenraveBase" ON)
 
 if(ENABLE_YarpOpenraveBase)
 
-find_package(YARP REQUIRED)
 find_package(OpenRAVE REQUIRED)
 find_package(Boost ${OpenRAVE_Boost_VERSION} EXACT REQUIRED COMPONENTS iostreams python thread system)
 

diff --git a/libraries/YarpPlugins/CMakeLists.txt b/libraries/YarpPlugins/CMakeLists.txt
@@ -2,17 +2,9 @@
 # Author: Juan G. Victores, Raul Fernandez-Fernandez
 # CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
 
-# Find YARP (common dependency for all devices).
-find_package(YARP REQUIRED)
-
-# Include YARP CMake modules (needless since YARP 2.3.70).
-list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
-
-# Utilities for creating YARP devices.
-include(YarpPlugin)
-
-# Common YARP includes for subdirectories (needless since YARP 2.3.70).
-include_directories(${YARP_INCLUDE_DIRS})
+if(YARP_VERSION_SHORT VERSION_LESS 2.3.70)
+    include_directories(${YARP_INCLUDE_DIRS})
+endif()
 
 # YARP devices.
 add_subdirectory(YarpOpenraveControlboard)