diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-30 12:34:18 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-30 12:34:18 +0100 |
| commit | 2623ec156f30bf6f5734fc965724d5d6f1d3f8ce (patch) | |
| tree | fa95eda346239b344b8204558d2b7257d69ff5d5 /CMakeLists.txt | |
| parent | f968e7355d62bbf8df426c51dc2aba98d2bc72b7 (diff) | |
| parent | 838f8603475def949646ececc8059e6b924bda28 (diff) | |
| download | px4-firmware-2623ec156f30bf6f5734fc965724d5d6f1d3f8ce.tar.gz px4-firmware-2623ec156f30bf6f5734fc965724d5d6f1d3f8ce.tar.bz2 px4-firmware-2623ec156f30bf6f5734fc965724d5d6f1d3f8ce.zip | |
Merge branch 'dev_ros_commander' into dev_ros
Conflicts:
CMakeLists.txt
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 220cd762b..6312fa055 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -203,6 +203,14 @@ target_link_libraries(mc_mixer px4 ) +## Commander +add_executable(commander + src/platforms/ros/nodes/commander/commander.cpp) +add_dependencies(manual_input px4_generate_messages_cpp) +target_link_libraries(commander + ${catkin_LIBRARIES} + px4 +) ############# ## Install ## |