Merge pull request #41 from traversaro/fix/YARPCMakeComponents

Explitly search for YARP rtf and manager CMake components
robotology · Jun 21, 2018 · 7b4a7fd · 7b4a7fd
2 parents f166266 + a2c395b
commit 7b4a7fd
Show file tree

Hide file tree

Showing 25 changed files with 2 additions and 111 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ project(iCub-Tests)
 # find a version of RTF higher then 1.3.2
 # and with yarp support enabled
 find_package(RTF 1.3.3 COMPONENTS DLL REQUIRED)
-find_package(YARP REQUIRED)
+find_package(YARP 3.0 COMPONENTS rtf manager REQUIRED)
 
 # set the output plugin directory to collect all the shared libraries
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins)

diff --git a/example/cpp/ExampleFixture/CMakeLists.txt b/example/cpp/ExampleFixture/CMakeLists.txt
@@ -15,11 +15,6 @@ project(${PROJECTNAME})
 find_package(RTF 1.1 COMPONENTS DLL)
 find_package(YARP)
 
-# add include directories
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 # add required libraries 
 link_libraries(${RTF_LIBRARIES}
                ${YARP_LIBRARIES} YARP::YARP_rtf)

diff --git a/example/cpp/ExampleTest/CMakeLists.txt b/example/cpp/ExampleTest/CMakeLists.txt
@@ -15,11 +15,6 @@ project(${PROJECTNAME})
 find_package(RTF 1.1 COMPONENTS DLL)
 find_package(YARP)
 
-# add include directories
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 # add the source codes to build the plugin library
 add_library(${PROJECTNAME} MODULE ExampleTest.h
                                   ExampleTest.cpp)

diff --git a/src/camera/CMakeLists.txt b/src/camera/CMakeLists.txt
@@ -10,10 +10,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME CameraTest)
 project(${PROJECTNAME})
 
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 rtf_add_plugin(${PROJECTNAME}     HEADERS CameraTest.h
                                   SOURCES CameraTest.cpp)
 

diff --git a/src/cartesian-control/reaching-tolerance/CMakeLists.txt b/src/cartesian-control/reaching-tolerance/CMakeLists.txt
@@ -10,11 +10,6 @@ project(CartesianControlReachingToleranceTest)
 
 list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
 
-# add include directories
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 # import math symbols from standard cmath
 add_definitions(-D_USE_MATH_DEFINES)
 

diff --git a/src/cartesian-control/simple-p2p-movement/CMakeLists.txt b/src/cartesian-control/simple-p2p-movement/CMakeLists.txt
@@ -9,11 +9,6 @@ project(CartesianControlSimpleP2pMovementTest)
 
 list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
 
-# add include directories
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 # import math symbols from standard cmath
 add_definitions(-D_USE_MATH_DEFINES)
 

diff --git a/src/controlModes/CMakeLists.txt b/src/controlModes/CMakeLists.txt
@@ -10,10 +10,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME ControlModes)
 project(${PROJECTNAME})
 
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 rtf_add_plugin(${PROJECT_NAME} HEADERS ControlModes.h
                                SOURCES ControlModes.cpp)
 target_link_libraries(${PROJECTNAME} ${RTF_LIBRARIES}

diff --git a/src/demoRedBall/CMakeLists.txt b/src/demoRedBall/CMakeLists.txt
@@ -9,11 +9,6 @@ project(DemoRedBallTest)
 
 list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
 
-# add include directories
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 # import math symbols from standard cmath
 add_definitions(-D_USE_MATH_DEFINES)
 

diff --git a/src/ftsensor-tests/CMakeLists.txt b/src/ftsensor-tests/CMakeLists.txt
@@ -11,11 +11,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME FtSensorTest)
 project(${PROJECTNAME})
 
-# add include directories
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 # add the source codes to build the plugin library
 rtf_add_plugin(${PROJECT_NAME} HEADERS FtSensorTest.h
                                SOURCES FtSensorTest.cpp)

diff --git a/src/gaze-control/simple-look/CMakeLists.txt b/src/gaze-control/simple-look/CMakeLists.txt
@@ -9,11 +9,6 @@ project(GazeControlSimpleLookTest)
 
 list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
 
-# add include directories
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 # import math symbols from standard cmath
 add_definitions(-D_USE_MATH_DEFINES)
 

diff --git a/src/jointLimits/CMakeLists.txt b/src/jointLimits/CMakeLists.txt
@@ -10,10 +10,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME JointLimits)
 project(${PROJECTNAME})
 
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 rtf_add_plugin(${PROJECT_NAME} HEADERS jointLimits.h
                                SOURCES jointLimits.cpp)
 target_link_libraries(${PROJECTNAME} ${RTF_LIBRARIES}

diff --git a/src/motor-stiction/CMakeLists.txt b/src/motor-stiction/CMakeLists.txt
@@ -10,10 +10,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME MotorStiction)
 project(${PROJECTNAME})
 
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 rtf_add_plugin(${PROJECT_NAME}    HEADERS MotorStiction.h
                                   SOURCES MotorStiction.cpp)
 

diff --git a/src/motor-tests/CMakeLists.txt b/src/motor-tests/CMakeLists.txt
@@ -11,12 +11,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME MotorTest)
 project(${PROJECTNAME})
 
-
-# add include directories
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 # add the source codes to build the plugin library
 rtf_add_plugin(${PROJECT_NAME}    HEADERS MotorTest.h
                                   SOURCES MotorTest.cpp)

diff --git a/src/motorEncoders-consistency/CMakeLists.txt b/src/motorEncoders-consistency/CMakeLists.txt
@@ -10,11 +10,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME MotorEncodersConsistency)
 project(${PROJECTNAME})
 
-
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 rtf_add_plugin(${PROJECT_NAME}    HEADERS motorEncodersConsistency.h
                                   SOURCES motorEncodersConsistency.cpp)
 

diff --git a/src/motorEncodersSignCheck/CMakeLists.txt b/src/motorEncodersSignCheck/CMakeLists.txt
@@ -10,11 +10,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME MotorEncodersSignCheck)
 project(${PROJECTNAME})
 
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS}
-                    )
-
 rtf_add_plugin(${PROJECT_NAME}    HEADERS motorEncodersSignCheck.h
                                   SOURCES motorEncodersSignCheck.cpp
                                   )

diff --git a/src/movementReferencesTest/CMakeLists.txt b/src/movementReferencesTest/CMakeLists.txt
@@ -10,11 +10,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME movementReferencesTest)
 project(${PROJECTNAME})
 
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS}
-                    )
-
 rtf_add_plugin(${PROJECT_NAME}    HEADERS movementReferencesTest.h
                                   SOURCES movementReferencesTest.cpp
                                   )

diff --git a/src/openloop-consistency/CMakeLists.txt b/src/openloop-consistency/CMakeLists.txt
@@ -10,10 +10,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME OpenloopConsistency)
 project(${PROJECTNAME})
 
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 rtf_add_plugin(${PROJECT_NAME}    HEADERS OpenloopConsistency.h
                                   SOURCES OpenloopConsistency.cpp)
 

diff --git a/src/opticalEncoders-drift/CMakeLists.txt b/src/opticalEncoders-drift/CMakeLists.txt
@@ -10,10 +10,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME OpticalEncodersDrift)
 project(${PROJECTNAME})
 
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 rtf_add_plugin(${PROJECT_NAME}    HEADERS opticalEncodersDrift.h
                                   SOURCES opticalEncodersDrift.cpp)
 

diff --git a/src/ports-frequency/CMakeLists.txt b/src/ports-frequency/CMakeLists.txt
@@ -11,11 +11,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME PortsFrequency)
 project(${PROJECTNAME})
 
-# add include directories
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 # add the source codes to build the plugin library
 rtf_add_plugin(${PROJECT_NAME}    HEADERS PortsFrequency.h
                                   SOURCES PortsFrequency.cpp)

diff --git a/src/positionControl-accuracy-ExternalPid/CMakeLists.txt b/src/positionControl-accuracy-ExternalPid/CMakeLists.txt
@@ -11,10 +11,7 @@ set(PROJECTNAME PositionControlAccuracyExternalPid)
 project(${PROJECTNAME})
 find_package(ICUB REQUIRED)
 
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS}
-                    ${ICUB_INCLUDE_DIRS})
+include_directories(${ICUB_INCLUDE_DIRS})
 
 rtf_add_plugin(${PROJECT_NAME}    HEADERS PositionControlAccuracyExternalPid.h
                                   SOURCES PositionControlAccuracyExternalPid.cpp)

diff --git a/src/positionControl-accuracy/CMakeLists.txt b/src/positionControl-accuracy/CMakeLists.txt
@@ -10,10 +10,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME PositionControlAccuracy)
 project(${PROJECTNAME})
 
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 rtf_add_plugin(${PROJECT_NAME}    HEADERS PositionControlAccuracy.h
                                   SOURCES PositionControlAccuracy.cpp)
 

diff --git a/src/positionDirect/CMakeLists.txt b/src/positionDirect/CMakeLists.txt
@@ -10,10 +10,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME PositionDirect)
 project(${PROJECTNAME})
 
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 rtf_add_plugin(${PROJECT_NAME}    HEADERS PositionDirect.h
                                   SOURCES PositionDirect.cpp)
 

diff --git a/src/skinWrapperTest/CMakeLists.txt b/src/skinWrapperTest/CMakeLists.txt
@@ -10,11 +10,6 @@ project(SkinWrapperTest)
 
 list(APPEND CMAKE_MODULE_PATH ${YARP_MODULE_PATH})
 
-# add include directories
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 # import math symbols from standard cmath
 add_definitions(-D_USE_MATH_DEFINES)
 

diff --git a/src/torqueControl-consistency/CMakeLists.txt b/src/torqueControl-consistency/CMakeLists.txt
@@ -10,10 +10,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME TorqueControlConsistency)
 project(${PROJECTNAME})
 
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 rtf_add_plugin(${PROJECT_NAME}    HEADERS TorqueControlConsistency.h
                                   SOURCES TorqueControlConsistency.cpp)
 

diff --git a/src/torqueControl-stiffDampCheck/CMakeLists.txt b/src/torqueControl-stiffDampCheck/CMakeLists.txt
@@ -10,10 +10,6 @@ cmake_minimum_required(VERSION 3.0)
 set(PROJECTNAME TorqueControlStiffDampCheck)
 project(${PROJECTNAME})
 
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${RTF_INCLUDE_DIRS}
-                    ${YARP_INCLUDE_DIRS})
-
 rtf_add_plugin(${PROJECT_NAME}    HEADERS TorqueControlStiffDampCheck.h
                                   SOURCES TorqueControlStiffDampCheck.cpp)