merge frankaemika#226

rickstaa · Nov 20, 2023 · 8c8013e · 8c8013e
1 parent 2f8e36b
commit 8c8013e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/franka_hw/CMakeLists.txt b/franka_hw/CMakeLists.txt
@@ -75,6 +75,17 @@ if (Franka_VERSION GREATER_EQUAL 0.9)
   target_compile_definitions(franka_hw PUBLIC ENABLE_BASE_ACCELERATION)
 endif()
 
+## Installation
+install(TARGETS franka_hw
+  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
+install(DIRECTORY include/${PROJECT_NAME}/
+  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+)
+
 ## franka_control_services
 add_library(franka_control_services
   src/services.cpp
@@ -98,6 +109,12 @@ target_include_directories(franka_control_services PUBLIC
   include
 )
 
+install(TARGETS franka_control_services
+  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
 if(CATKIN_ENABLE_TESTING)
   add_subdirectory(test)
 endif()

diff --git a/franka_ros/CMakeLists.txt b/franka_ros/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1.3)
+cmake_minimum_required(VERSION 3.4)
 project(franka_ros)
 find_package(catkin REQUIRED)
 catkin_metapackage()