From d5f07a99470261fef9435a6d0bcd86bd9ca69c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20J=C3=A4hne?= <christoph.jaehne@franka.de>
Date: Fri, 9 Aug 2019 11:00:16 +0200
Subject: [PATCH] franka 0.5 -> franka 0.7, fixed cmake for service lib
---
franka_control/CMakeLists.txt | 4 ++--
franka_example_controllers/CMakeLists.txt | 2 +-
franka_gripper/CMakeLists.txt | 2 +-
franka_hw/CMakeLists.txt | 4 ++--
franka_visualization/CMakeLists.txt | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/franka_control/CMakeLists.txt b/franka_control/CMakeLists.txt
index 065df6a..a753cda 100644
--- a/franka_control/CMakeLists.txt
+++ b/franka_control/CMakeLists.txt
@@ -19,11 +19,11 @@ find_package(catkin REQUIRED COMPONENTS
tf2_msgs
)
-find_package(Franka 0.5.0 REQUIRED)
+find_package(Franka 0.7.0 REQUIRED)
catkin_package(
INCLUDE_DIRS include
- LIBRARIES franka_state_controller franka_control_services
+ LIBRARIES franka_state_controller
CATKIN_DEPENDS
controller_interface
franka_hw
diff --git a/franka_example_controllers/CMakeLists.txt b/franka_example_controllers/CMakeLists.txt
index 669121c..3f935f9 100644
--- a/franka_example_controllers/CMakeLists.txt
+++ b/franka_example_controllers/CMakeLists.txt
@@ -22,7 +22,7 @@ find_package(catkin REQUIRED COMPONENTS
)
find_package(Eigen3 REQUIRED)
-find_package(Franka 0.5.0 REQUIRED)
+find_package(Franka 0.7.0 REQUIRED)
add_message_files(FILES
JointTorqueComparison.msg
diff --git a/franka_gripper/CMakeLists.txt b/franka_gripper/CMakeLists.txt
index 3807019..14dd852 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 0.5.0 REQUIRED)
+find_package(Franka 0.7.0 REQUIRED)
add_action_files(
DIRECTORY action
diff --git a/franka_hw/CMakeLists.txt b/franka_hw/CMakeLists.txt
index 90b93b8..417b816 100644
--- a/franka_hw/CMakeLists.txt
+++ b/franka_hw/CMakeLists.txt
@@ -17,11 +17,11 @@ find_package(catkin REQUIRED COMPONENTS
message_generation
)
-find_package(Franka 0.5.0 REQUIRED)
+find_package(Franka 0.7.0 REQUIRED)
catkin_package(
INCLUDE_DIRS include
- LIBRARIES franka_hw
+ LIBRARIES franka_hw franka_control_services
CATKIN_DEPENDS
actionlib_msgs
actionlib
diff --git a/franka_visualization/CMakeLists.txt b/franka_visualization/CMakeLists.txt
index 65322dd..3354d32 100644
--- a/franka_visualization/CMakeLists.txt
+++ b/franka_visualization/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package(catkin REQUIRED COMPONENTS
roscpp
)
-find_package(Franka 0.5.0 REQUIRED)
+find_package(Franka 0.7.0 REQUIRED)
catkin_package(CATKIN_DEPENDS sensor_msgs roscpp)
--
GitLab