Merge remote-tracking branch 'origin/melodic' into noetic

Author: DLu

range_sensor_layer/CMakeLists.txt

@@ -3,22 +3,32 @@ project(range_sensor_layer)
 set_directory_properties(PROPERTIES COMPILE_OPTIONS "-Wall;-Werror")
 
 find_package(catkin REQUIRED COMPONENTS
-  angles
-  costmap_2d
-  dynamic_reconfigure
-  geometry_msgs
-  pluginlib
-  roscpp
-  sensor_msgs
-  tf2_geometry_msgs
+    angles
+    costmap_2d
+    dynamic_reconfigure
+    geometry_msgs
+    pluginlib
+    roscpp
+    rospy
+    sensor_msgs
+    tf2_geometry_msgs
 )
 
 generate_dynamic_reconfigure_options(cfg/RangeSensorLayer.cfg)
 
 catkin_package(
-    CATKIN_DEPENDS angles costmap_2d dynamic_reconfigure geometry_msgs pluginlib roscpp sensor_msgs tf2_geometry_msgs
+    CATKIN_DEPENDS
+        angles
+        costmap_2d
+        dynamic_reconfigure
+        geometry_msgs
+        pluginlib
+        roscpp
+        rospy
+        sensor_msgs
+        tf2_geometry_msgs
     INCLUDE_DIRS include
-    LIBRARIES range_sensor_layer
+    LIBRARIES ${PROJECT_NAME}
 )
 
 include_directories(include ${catkin_INCLUDE_DIRS})
@@ -33,7 +43,7 @@ if(CATKIN_ENABLE_TESTING)
   roslint_add_test()
 endif()
 
-install(TARGETS range_sensor_layer
+install(TARGETS ${PROJECT_NAME}
         LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
@@ -46,4 +56,6 @@ install(FILES costmap_plugins.xml
 install(DIRECTORY include/${PROJECT_NAME}/
         DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
 )
-catkin_install_python(PROGRAMS scripts/send_message.py DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+catkin_install_python(PROGRAMS scripts/send_message.py
+                      DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)

range_sensor_layer/include/range_sensor_layer/range_sensor_layer.h

@@ -8,7 +8,9 @@
 #include <range_sensor_layer/RangeSensorLayerConfig.h>
 #include <dynamic_reconfigure/server.h>
 #include <list>
+#include <map>
 #include <string>
+#include <utility>
 #include <vector>
 #include <tf2_geometry_msgs/tf2_geometry_msgs.h>
 

range_sensor_layer/src/range_sensor_layer.cpp

@@ -7,7 +7,9 @@
 #include <algorithm>
 #include <list>
 #include <limits>
+#include <map>
 #include <string>
+#include <utility>
 
 PLUGINLIB_EXPORT_CLASS(range_sensor_layer::RangeSensorLayer, costmap_2d::Layer)
 

social_navigation_layers/CMakeLists.txt

@@ -55,5 +55,5 @@ install(TARGETS social_layers
 
 install(
     DIRECTORY include/${PROJECT_NAME}/
-        DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+    DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
 )

social_navigation_layers/costmap_plugins.xml

@@ -6,4 +6,3 @@
     <description>Uses people information to change the costmap</description>
   </class>
 </library>
-