don't install header that will be removed

Signed-off-by: Louise Poubel <louise@openrobotics.org>
ros-simulation · Aug 21, 2019 · 8719c30 · 8719c30
1 parent c5506ed
commit 8719c30
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/gazebo_plugins/src/gazebo_ros_camera.cpp b/gazebo_plugins/src/gazebo_ros_camera.cpp
@@ -19,7 +19,6 @@
 
 #include <camera_info_manager/camera_info_manager.h>
 #include <gazebo_plugins/gazebo_ros_camera.hpp>
-#include <gazebo_plugins/gazebo_ros_depth_camera.hpp>
 #include <gazebo_ros/conversions/builtin_interfaces.hpp>
 #include <gazebo_ros/node.hpp>
 #include <gazebo_ros/utils.hpp>
@@ -33,6 +32,9 @@
 #include <mutex>
 #include <string>
 
+// Not installed on Dashing because it will be removed on Eloquent
+#include "gazebo_ros_depth_camera.hpp"
+
 namespace gazebo_plugins
 {
 class GazeboRosCameraPrivate

diff --git a/gazebo_plugins/src/gazebo_ros_depth_camera.cpp b/gazebo_plugins/src/gazebo_ros_depth_camera.cpp
@@ -19,7 +19,6 @@
 #include <ignition/math/Helpers.hh>
 
 #include <camera_info_manager/camera_info_manager.h>
-#include <gazebo_plugins/gazebo_ros_depth_camera.hpp>
 #include <gazebo_ros/conversions/builtin_interfaces.hpp>
 #include <gazebo_ros/node.hpp>
 #include <gazebo_ros/utils.hpp>
@@ -36,6 +35,9 @@
 #include <mutex>
 #include <string>
 
+// Not installed on Dashing because it will be removed on Eloquent
+#include "gazebo_ros_depth_camera.hpp"
+
 #define FLOAT_SIZE sizeof(float)
 
 namespace gazebo_plugins

diff --git a/...azebo_plugins/gazebo_ros_depth_camera.hpp → ...o_plugins/src/gazebo_ros_depth_camera.hpp b/...azebo_plugins/gazebo_ros_depth_camera.hpp → ...o_plugins/src/gazebo_ros_depth_camera.hpp
diff --git a/gazebo_plugins/worlds/gazebo_ros_depth_camera_demo.world b/gazebo_plugins/worlds/gazebo_ros_depth_camera_demo.world
@@ -158,7 +158,7 @@
             <!-- omit camera_name to default to sensor name -->
             <camera_name>mycamera</camera_name>
 
-            <!-- frame_name>omit so it defaults to link name</frameName-->
+            <!-- frame_name>omit so it defaults to link name</frame_name-->
 
             <min_depth>0.1</min_depth>
             <max_depth>500</max_depth>
@@ -167,4 +167,4 @@
       </link>
     </model>
   </world>
-</sdf>
+</sdf>