From c44132519c01a630f2032f26830c7f875ce0bc41 Mon Sep 17 00:00:00 2001 From: Florian Walch <florian.walch@franka.de> Date: Tue, 30 Jan 2018 13:42:49 +0100 Subject: [PATCH] Fix franka_example_controllers dependencies --- CHANGELOG.md | 6 ++++++ franka_control/CMakeLists.txt | 2 +- franka_example_controllers/CMakeLists.txt | 7 ++++++- franka_example_controllers/package.xml | 1 + franka_gripper/CMakeLists.txt | 2 +- franka_hw/CMakeLists.txt | 2 +- franka_visualization/CMakeLists.txt | 2 +- 7 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb95821..61545fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # CHANGELOG +## 0.2.1 - UNRELEASED + +Requires `libfranka` >= 0.2.0 + + * Added missing dependency to `franka_example_controllers` + ## 0.2.0 - 2018-01-29 Requires `libfranka` >= 0.2.0 diff --git a/franka_control/CMakeLists.txt b/franka_control/CMakeLists.txt index 2f2b14b..9dbbba7 100644 --- a/franka_control/CMakeLists.txt +++ b/franka_control/CMakeLists.txt @@ -21,7 +21,7 @@ find_package(catkin REQUIRED COMPONENTS tf2_msgs ) -find_package(Franka REQUIRED) +find_package(Franka 0.2.0 REQUIRED) add_service_files(FILES SetCartesianImpedance.srv diff --git a/franka_example_controllers/CMakeLists.txt b/franka_example_controllers/CMakeLists.txt index feec755..3afabc1 100644 --- a/franka_example_controllers/CMakeLists.txt +++ b/franka_example_controllers/CMakeLists.txt @@ -17,6 +17,7 @@ find_package(catkin REQUIRED COMPONENTS ) find_package(Eigen3 REQUIRED) +find_package(Franka 0.2.0 REQUIRED) add_message_files(FILES JointTorqueComparison.msg @@ -33,6 +34,7 @@ catkin_package( INCLUDE_DIRS include LIBRARIES franka_example_controllers CATKIN_DEPENDS controller_interface franka_hw pluginlib + DEPENDS Franka ) include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS}) @@ -56,7 +58,10 @@ add_dependencies(franka_example_controllers ${PROJECT_NAME}_gencfg ) -target_link_libraries(franka_example_controllers ${catkin_LIBRARIES}) +target_link_libraries(franka_example_controllers + ${catkin_LIBRARIES} + Franka::Franka +) ## Installation install(TARGETS franka_example_controllers diff --git a/franka_example_controllers/package.xml b/franka_example_controllers/package.xml index 0ccc65d..4f240b2 100644 --- a/franka_example_controllers/package.xml +++ b/franka_example_controllers/package.xml @@ -20,6 +20,7 @@ <depend>controller_interface</depend> <depend>franka_hw</depend> + <depend>libfranka</depend> <depend>pluginlib</depend> <depend>realtime_tools</depend> diff --git a/franka_gripper/CMakeLists.txt b/franka_gripper/CMakeLists.txt index d0113f2..f501b34 100644 --- a/franka_gripper/CMakeLists.txt +++ b/franka_gripper/CMakeLists.txt @@ -14,7 +14,7 @@ find_package(catkin REQUIRED COMPONENTS actionlib_msgs ) -find_package(Franka REQUIRED) +find_package(Franka 0.2.0 REQUIRED) add_action_files( DIRECTORY action diff --git a/franka_hw/CMakeLists.txt b/franka_hw/CMakeLists.txt index a4f25a5..096e631 100644 --- a/franka_hw/CMakeLists.txt +++ b/franka_hw/CMakeLists.txt @@ -11,7 +11,7 @@ find_package(catkin REQUIRED COMPONENTS roscpp ) -find_package(Franka REQUIRED) +find_package(Franka 0.2.0 REQUIRED) catkin_package( INCLUDE_DIRS include diff --git a/franka_visualization/CMakeLists.txt b/franka_visualization/CMakeLists.txt index e5ffe18..76f4182 100644 --- a/franka_visualization/CMakeLists.txt +++ b/franka_visualization/CMakeLists.txt @@ -9,7 +9,7 @@ find_package(catkin REQUIRED COMPONENTS roscpp ) -find_package(Franka REQUIRED) +find_package(Franka 0.2.0 REQUIRED) catkin_package(CATKIN_DEPENDS sensor_msgs roscpp) -- GitLab