resovled conflicts

This commit is contained in:
Ruixiang Du
2020-08-21 16:50:53 +08:00
82 changed files with 8838 additions and 130 deletions

View File

@@ -51,15 +51,11 @@ set_property(TARGET scout_messenger PROPERTY POSITION_INDEPENDENT_CODE ON)
add_executable(scout_base_node src/scout_base_node.cpp)
target_link_libraries(scout_base_node scout_messenger ${catkin_LIBRARIES})
add_executable(scout_base_sim_node src/scout_base_sim_node.cpp)
target_link_libraries(scout_base_sim_node scout_messenger ${catkin_LIBRARIES})
#############
## Install ##
#############
roslaunch_add_file_check(launch)
# roslaunch_add_file_check(launch)
install(TARGETS scout_messenger scout_base_node
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}