Skip to content

Commit

Permalink
Add install targets for simple_message, industrial_robot_client, indu…
Browse files Browse the repository at this point in the history
…strial_utils and industrial_deprecated.

These packages were missing proper install targets, causing problems when trying to use these in an 'install space'.
  • Loading branch information
gavanderhoorn committed Jul 24, 2013
1 parent 4405b0d commit b3e80e8
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 0 deletions.
4 changes: 4 additions & 0 deletions industrial_deprecated/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,7 @@ catkin_package(
install(PROGRAMS scripts/fake_time.py
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

install(DIRECTORY launch/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
)
25 changes: 25 additions & 0 deletions industrial_robot_client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,29 @@ catkin_add_gtest(utest_robot_client test/utest.cpp)
target_link_libraries(utest_robot_client industrial_robot_client ${catkin_LIBRARIES})


#############
## Install ##
#############
install(
TARGETS industrial_robot_client industrial_robot_client_bswap
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})

install(TARGETS
robot_state
robot_state_bswap
motion_streaming_interface
motion_download_interface
motion_streaming_interface_bswap
motion_download_interface_bswap
joint_trajectory_action
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

install(
DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})

foreach(dir config launch)
install(DIRECTORY ${dir}/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
endforeach(dir)

9 changes: 9 additions & 0 deletions industrial_utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,13 @@ target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
catkin_add_gtest(utest_inds_utils test/utest.cpp)
target_link_libraries(utest_inds_utils ${PROJECT_NAME} ${catkin_LIBRARIES})

#############
## Install ##
#############
install(
TARGETS ${PROJECT_NAME}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})

install(
DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
12 changes: 12 additions & 0 deletions simple_message/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,15 @@ add_dependencies(simple_message_float64 ${industrial_msgs_EXPORTED_TARGETS})
catkin_add_gtest(utest_float64 ${UTEST_SRC_FILES})
set_target_properties(utest_float64 PROPERTIES COMPILE_DEFINITIONS "FLOAT64")
target_link_libraries(utest_float64 simple_message_float64)


#############
## Install ##
#############
install(
TARGETS simple_message simple_message_bswap simple_message_float64
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})

install(
DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})

0 comments on commit b3e80e8

Please sign in to comment.