Moving launch files around.

petrlmat · Sep 14, 2018 · 849437e · 849437e
1 parent 63ea202
commit 849437e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 4 deletions.
diff --git a/subt_example/launch/team.launch b/subt_example/launch/team.launch
@@ -45,7 +45,7 @@
 
   <!-- X3 quadcopter -->
   <group ns="$(arg x3_name)">
-    <include file="$(find subt_example)/launch/spawn_x3.launch">
+    <include file="$(find x3_description)/launch/spawn_x3.launch">
       <arg name="mav_name" value="X3" />
       <arg name="x" value="-1"/>
       <arg name="y" value="-1"/>
@@ -65,7 +65,7 @@
 
   <!-- X4 quadcopter -->
   <group ns="$(arg x4_name)">
-    <include file="$(find subt_example)/launch/spawn_x4.launch">
+    <include file="$(find x4_description)/launch/spawn_x4.launch">
       <arg name="mav_name" value="X4" />
       <arg name="x" value="-2"/>
       <arg name="y" value="-1"/>

diff --git a/x3_description/CMakeLists.txt b/x3_description/CMakeLists.txt
@@ -5,6 +5,6 @@ find_package(catkin REQUIRED COMPONENTS roslaunch)
 
 catkin_package()
 
-install(DIRECTORY meshes urdf
+install(DIRECTORY meshes urdf launch
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
diff --git a/subt_example/launch/spawn_x3.launch → x3_description/launch/spawn_x3.launch b/subt_example/launch/spawn_x3.launch → x3_description/launch/spawn_x3.launch
diff --git a/x3_description/package.xml b/x3_description/package.xml
@@ -15,6 +15,7 @@
   <run_depend>urdf</run_depend>
   <run_depend>xacro</run_depend>
   <run_depend>rotors_description</run_depend>
+  <run_depend>rotors_gazebo</run_depend>
 
   <export>
   </export>

diff --git a/x4_description/CMakeLists.txt b/x4_description/CMakeLists.txt
@@ -5,6 +5,6 @@ find_package(catkin REQUIRED COMPONENTS roslaunch)
 
 catkin_package()
 
-install(DIRECTORY meshes urdf
+install(DIRECTORY meshes urdf launch
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
diff --git a/subt_example/launch/spawn_x4.launch → x4_description/launch/spawn_x4.launch b/subt_example/launch/spawn_x4.launch → x4_description/launch/spawn_x4.launch
diff --git a/x4_description/package.xml b/x4_description/package.xml
@@ -15,6 +15,7 @@
   <run_depend>urdf</run_depend>
   <run_depend>xacro</run_depend>
   <run_depend>rotors_description</run_depend>
+  <run_depend>rotors_gazebo</run_depend>
 
   <export>
   </export>