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

Add missing install rules

Fixes #3 (GH).
parent 45042c3b
Branches
No related tags found
No related merge requests found
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
* Fix dependencies on libfranka * Fix dependencies on libfranka
* Fix RViz config file path in `franka_visualization` * Fix RViz config file path in `franka_visualization`
* Add missing `test_depend` to `franka_hw` * Add missing `test_depend` to `franka_hw`
* Add missing CMake install rules
## 0.1.0 - 2017-09-15 ## 0.1.0 - 2017-09-15
......
...@@ -120,6 +120,27 @@ target_include_directories(franka_control_node PUBLIC ...@@ -120,6 +120,27 @@ target_include_directories(franka_control_node PUBLIC
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
) )
## Installation
install(TARGETS franka_state_controller
franka_control_services
franka_control_node
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}
)
install(DIRECTORY launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
install(DIRECTORY config
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
install(FILES franka_controller_plugins.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
## Tools ## Tools
file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
file(GLOB_RECURSE HEADERS file(GLOB_RECURSE HEADERS
......
...@@ -3,3 +3,10 @@ project(franka_description) ...@@ -3,3 +3,10 @@ project(franka_description)
find_package(catkin REQUIRED) find_package(catkin REQUIRED)
catkin_package(CATKIN_DEPENDS xacro) catkin_package(CATKIN_DEPENDS xacro)
install(DIRECTORY meshes
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
install(DIRECTORY robots
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
...@@ -45,6 +45,25 @@ add_dependencies(franka_example_controllers ...@@ -45,6 +45,25 @@ add_dependencies(franka_example_controllers
target_link_libraries(franka_example_controllers ${catkin_LIBRARIES}) target_link_libraries(franka_example_controllers ${catkin_LIBRARIES})
## Installation
install(TARGETS franka_example_controllers
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}
)
install(DIRECTORY launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
install(DIRECTORY config
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
install(FILES franka_example_controllers_plugin.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
## Tools ## Tools
file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
file(GLOB_RECURSE HEADERS file(GLOB_RECURSE HEADERS
......
...@@ -81,6 +81,23 @@ target_include_directories(franka_gripper_node PUBLIC ...@@ -81,6 +81,23 @@ target_include_directories(franka_gripper_node PUBLIC
include include
) )
## Installation
install(TARGETS franka_gripper
franka_gripper_node
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}
)
install(DIRECTORY launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
install(DIRECTORY config
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
## Tools ## Tools
file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
file(GLOB_RECURSE HEADERS file(GLOB_RECURSE HEADERS
......
...@@ -45,6 +45,16 @@ target_include_directories(franka_hw PUBLIC ...@@ -45,6 +45,16 @@ target_include_directories(franka_hw PUBLIC
include include
) )
## 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}
)
if(CATKIN_ENABLE_TESTING) if(CATKIN_ENABLE_TESTING)
add_subdirectory(test) add_subdirectory(test)
endif() endif()
......
...@@ -15,26 +15,33 @@ find_package(Franka REQUIRED) ...@@ -15,26 +15,33 @@ find_package(Franka REQUIRED)
catkin_package(CATKIN_DEPENDS sensor_msgs roscpp) catkin_package(CATKIN_DEPENDS sensor_msgs roscpp)
set(EXECUTABLES add_executable(franka_joint_state_publisher
franka_joint_state_publisher src/franka_joint_state_publisher.cpp
) )
add_dependencies(franka_joint_state_publisher
foreach(executable ${EXECUTABLES})
add_executable(${executable}
src/${executable}.cpp
)
add_dependencies(${executable}
${${PROJECT_NAME}_EXPORTED_TARGETS} ${${PROJECT_NAME}_EXPORTED_TARGETS}
${catkin_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}
) )
target_link_libraries(${executable} target_link_libraries(franka_joint_state_publisher
${catkin_LIBRARIES} ${catkin_LIBRARIES}
Franka::Franka Franka::Franka
) )
target_include_directories(${executable} PUBLIC target_include_directories(franka_joint_state_publisher PUBLIC
${catkin_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS}
) )
endforeach()
## Installation
install(TARGETS franka_joint_state_publisher
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)
install(DIRECTORY launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
install(DIRECTORY config
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
## Tools ## Tools
file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp) file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
...@@ -46,5 +53,5 @@ include(ClangTools) ...@@ -46,5 +53,5 @@ include(ClangTools)
add_format_target(franka_visualization FILES ${SOURCES} ${HEADERS}) add_format_target(franka_visualization FILES ${SOURCES} ${HEADERS})
add_tidy_target(franka_visualization add_tidy_target(franka_visualization
FILES ${SOURCES} FILES ${SOURCES}
DEPENDS ${EXECUTABLES} DEPENDS franka_joint_state_publisher
) )
...@@ -6,4 +6,3 @@ joint_names: ...@@ -6,4 +6,3 @@ joint_names:
- panda_joint5 - panda_joint5
- panda_joint6 - panda_joint6
- panda_joint7 - panda_joint7
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<param if="$(arg load_gripper)" name="robot_description" command="$(find xacro)/xacro --inorder $(find franka_description)/robots/panda_arm_hand.urdf.xacro" /> <param if="$(arg load_gripper)" name="robot_description" command="$(find xacro)/xacro --inorder $(find franka_description)/robots/panda_arm_hand.urdf.xacro" />
<node name="franka_joint_state_publisher" pkg="franka_visualization" type="franka_joint_state_publisher" output="screen"> <node name="franka_joint_state_publisher" pkg="franka_visualization" type="franka_joint_state_publisher" output="screen">
<rosparam command="load" file="$(find franka_visualization)/param/robot_read_settings.yaml" /> <rosparam command="load" file="$(find franka_visualization)/config/robot_read_settings.yaml" />
<param name="robot_ip" value="$(arg robot_ip)" /> <param name="robot_ip" value="$(arg robot_ip)" />
</node> </node>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment