Skip to content
Snippets Groups Projects
Commit c4413251 authored by Florian Walch's avatar Florian Walch
Browse files

Fix franka_example_controllers dependencies

parent 5b3bcd49
Branches
No related tags found
No related merge requests found
# CHANGELOG # CHANGELOG
## 0.2.1 - UNRELEASED
Requires `libfranka` >= 0.2.0
* Added missing dependency to `franka_example_controllers`
## 0.2.0 - 2018-01-29 ## 0.2.0 - 2018-01-29
Requires `libfranka` >= 0.2.0 Requires `libfranka` >= 0.2.0
......
...@@ -21,7 +21,7 @@ find_package(catkin REQUIRED COMPONENTS ...@@ -21,7 +21,7 @@ find_package(catkin REQUIRED COMPONENTS
tf2_msgs tf2_msgs
) )
find_package(Franka REQUIRED) find_package(Franka 0.2.0 REQUIRED)
add_service_files(FILES add_service_files(FILES
SetCartesianImpedance.srv SetCartesianImpedance.srv
......
...@@ -17,6 +17,7 @@ find_package(catkin REQUIRED COMPONENTS ...@@ -17,6 +17,7 @@ find_package(catkin REQUIRED COMPONENTS
) )
find_package(Eigen3 REQUIRED) find_package(Eigen3 REQUIRED)
find_package(Franka 0.2.0 REQUIRED)
add_message_files(FILES add_message_files(FILES
JointTorqueComparison.msg JointTorqueComparison.msg
...@@ -33,6 +34,7 @@ catkin_package( ...@@ -33,6 +34,7 @@ catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
LIBRARIES franka_example_controllers LIBRARIES franka_example_controllers
CATKIN_DEPENDS controller_interface franka_hw pluginlib CATKIN_DEPENDS controller_interface franka_hw pluginlib
DEPENDS Franka
) )
include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS})
...@@ -56,7 +58,10 @@ add_dependencies(franka_example_controllers ...@@ -56,7 +58,10 @@ add_dependencies(franka_example_controllers
${PROJECT_NAME}_gencfg ${PROJECT_NAME}_gencfg
) )
target_link_libraries(franka_example_controllers ${catkin_LIBRARIES}) target_link_libraries(franka_example_controllers
${catkin_LIBRARIES}
Franka::Franka
)
## Installation ## Installation
install(TARGETS franka_example_controllers install(TARGETS franka_example_controllers
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<depend>controller_interface</depend> <depend>controller_interface</depend>
<depend>franka_hw</depend> <depend>franka_hw</depend>
<depend>libfranka</depend>
<depend>pluginlib</depend> <depend>pluginlib</depend>
<depend>realtime_tools</depend> <depend>realtime_tools</depend>
......
...@@ -14,7 +14,7 @@ find_package(catkin REQUIRED COMPONENTS ...@@ -14,7 +14,7 @@ find_package(catkin REQUIRED COMPONENTS
actionlib_msgs actionlib_msgs
) )
find_package(Franka REQUIRED) find_package(Franka 0.2.0 REQUIRED)
add_action_files( add_action_files(
DIRECTORY action DIRECTORY action
......
...@@ -11,7 +11,7 @@ find_package(catkin REQUIRED COMPONENTS ...@@ -11,7 +11,7 @@ find_package(catkin REQUIRED COMPONENTS
roscpp roscpp
) )
find_package(Franka REQUIRED) find_package(Franka 0.2.0 REQUIRED)
catkin_package( catkin_package(
INCLUDE_DIRS include INCLUDE_DIRS include
......
...@@ -9,7 +9,7 @@ find_package(catkin REQUIRED COMPONENTS ...@@ -9,7 +9,7 @@ find_package(catkin REQUIRED COMPONENTS
roscpp roscpp
) )
find_package(Franka REQUIRED) find_package(Franka 0.2.0 REQUIRED)
catkin_package(CATKIN_DEPENDS sensor_msgs roscpp) catkin_package(CATKIN_DEPENDS sensor_msgs roscpp)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment