Skip to content

Commit

Permalink
Fixed install method
Browse files Browse the repository at this point in the history
  • Loading branch information
davetcoleman committed Dec 12, 2014
1 parent 2dbc414 commit f6023d8
Showing 1 changed file with 16 additions and 9 deletions.
25 changes: 16 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@ include_directories(
add_library(${PROJECT_NAME}
src/moveit_visual_tools.cpp
)

add_dependencies(${PROJECT_NAME} graph_msgs_generate_messages_cpp)

target_link_libraries(${PROJECT_NAME}
${catkin_LIBRARIES} ${Boost_LIBRARIES}
)
Expand All @@ -70,12 +68,21 @@ target_link_libraries(collision_objects_test
${catkin_LIBRARIES} ${PROJECT_NAME}
)

# Install
install(TARGETS ${PROJECT_NAME}
## Install

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

# Mark cpp header files for installation
install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
FILES_MATCHING PATTERN "*.h"
)
# Install header files
install(DIRECTORY include/$PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})

# Install shared resources
install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
install(DIRECTORY resources DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

# Install executables
install(TARGETS moveit_visual_tools_test collision_objects_test
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

0 comments on commit f6023d8

Please sign in to comment.