Revision 112bf9db
Merged changes in scoutsim makelists.
| scout/scoutsim/CMakeLists.txt | ||
|---|---|---|
| 36 | 36 |
#rosbuild_add_executable(turtle_teleop_key tutorials/teleop_turtle_key.cpp) |
| 37 | 37 |
#rosbuild_add_executable(draw_square tutorials/draw_square.cpp) |
| 38 | 38 |
#rosbuild_add_executable(mimic tutorials/mimic.cpp) |
| 39 |
<<<<<<< Updated upstream |
|
| 40 | 39 |
rosbuild_add_executable(scout_teleop src/scout_teleop.cpp) |
| 41 |
======= |
|
| 42 |
rosbuild_add_executable(spawn_scout src/spawn_scout.cpp) |
|
| 43 |
>>>>>>> Stashed changes |
|
Also available in: Unified diff