Merge branch 'ros_dev_roman' into dev_ros

This commit is contained in:
Roman Bapst
2014-12-30 11:42:15 +01:00
2 changed files with 193 additions and 0 deletions

View File

@@ -194,6 +194,15 @@ target_link_libraries(manual_input
px4
)
## Multicopter Mixer dummy
add_executable(mc_mixer
src/platforms/ros/nodes/mc_mixer.cpp)
add_dependencies(mc_mixer px4_generate_messages_cpp)
target_link_libraries(mc_mixer
${catkin_LIBRARIES}
px4
)
#############
## Install ##