move metrics messages at root of msg folder (cartographer-project#1020)

wohe · Oct 17, 2018 · ed41840 · ed41840
1 parent 6b9d8ff
commit ed41840
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/cartographer_ros_msgs/CMakeLists.txt b/cartographer_ros_msgs/CMakeLists.txt
@@ -27,8 +27,12 @@ add_message_files(
   DIRECTORY msg
   FILES
     BagfileProgress.msg
+    HistogramBucket.msg
     LandmarkEntry.msg
     LandmarkList.msg
+    MetricFamily.msg
+    MetricLabel.msg
+    Metric.msg
     SensorTopics.msg
     StatusCode.msg
     StatusResponse.msg
@@ -39,15 +43,6 @@ add_message_files(
     TrajectoryStates.msg
 )
 
-add_message_files(
-  DIRECTORY msg/metrics
-  FILES
-    HistogramBucket.msg
-    MetricFamily.msg
-    MetricLabel.msg
-    Metric.msg
-)
-
 add_service_files(
   DIRECTORY srv
   FILES

diff --git a/..._ros_msgs/msg/metrics/HistogramBucket.msg → ...ographer_ros_msgs/msg/HistogramBucket.msg b/..._ros_msgs/msg/metrics/HistogramBucket.msg → ...ographer_ros_msgs/msg/HistogramBucket.msg
diff --git a/cartographer_ros_msgs/msg/metrics/Metric.msg → cartographer_ros_msgs/msg/Metric.msg b/cartographer_ros_msgs/msg/metrics/Metric.msg → cartographer_ros_msgs/msg/Metric.msg
diff --git a/...her_ros_msgs/msg/metrics/MetricFamily.msg → cartographer_ros_msgs/msg/MetricFamily.msg b/...her_ros_msgs/msg/metrics/MetricFamily.msg → cartographer_ros_msgs/msg/MetricFamily.msg
diff --git a/...pher_ros_msgs/msg/metrics/MetricLabel.msg → cartographer_ros_msgs/msg/MetricLabel.msg b/...pher_ros_msgs/msg/metrics/MetricLabel.msg → cartographer_ros_msgs/msg/MetricLabel.msg