aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorRoman Bapst <romanbapst@yahoo.de>2014-12-30 11:42:15 +0100
committerRoman Bapst <romanbapst@yahoo.de>2014-12-30 11:42:15 +0100
commit40f6e9f38600c7e8513a03231b10037da98b2745 (patch)
treef0a9bee65d8783d41de237b2e81f19b50c98fd2b /CMakeLists.txt
parent4c511210793c7b2479291bb2abb1de7ce1362b9e (diff)
parentbfc398442663a943ff1e0fa21ec50b9960abb5a7 (diff)
downloadpx4-firmware-40f6e9f38600c7e8513a03231b10037da98b2745.tar.gz
px4-firmware-40f6e9f38600c7e8513a03231b10037da98b2745.tar.bz2
px4-firmware-40f6e9f38600c7e8513a03231b10037da98b2745.zip
Merge branch 'ros_dev_roman' into dev_ros
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d506cadb1..a7277b02a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 ##