Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explitly search for YARP rtf and manager CMake components #41

Merged
merged 3 commits into from
Jun 21, 2018
Merged

Explitly search for YARP rtf and manager CMake components #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d310f0a
Explitly search for YARP rtf and manager CMake components
traversaro Jun 7, 2018
f782fbb
Require Yarp 3.0
diegoferigo Jun 21, 2018
a2c395b
Removed include_directories since they are now imported from the CMak…
diegoferigo Jun 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions example/cpp/ExampleFixture/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions example/cpp/ExampleTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions src/camera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 0 additions & 5 deletions src/cartesian-control/reaching-tolerance/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 0 additions & 5 deletions src/cartesian-control/simple-p2p-movement/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 0 additions & 4 deletions src/controlModes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
5 changes: 0 additions & 5 deletions src/demoRedBall/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 0 additions & 5 deletions src/ftsensor-tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions src/gaze-control/simple-look/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 0 additions & 4 deletions src/jointLimits/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 0 additions & 4 deletions src/motor-stiction/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 0 additions & 6 deletions src/motor-tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions src/motorEncoders-consistency/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 0 additions & 5 deletions src/motorEncodersSignCheck/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
5 changes: 0 additions & 5 deletions src/movementReferencesTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
4 changes: 0 additions & 4 deletions src/openloop-consistency/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 0 additions & 4 deletions src/opticalEncoders-drift/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 0 additions & 5 deletions src/ports-frequency/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 1 addition & 4 deletions src/positionControl-accuracy-ExternalPid/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions src/positionControl-accuracy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 0 additions & 4 deletions src/positionDirect/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 0 additions & 5 deletions src/skinWrapperTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 0 additions & 4 deletions src/torqueControl-consistency/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 0 additions & 4 deletions src/torqueControl-stiffDampCheck/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down