Small build fixes (ros-perception#4)

RonaldEnsing · May 30, 2017 · 0e84b54 · 0e84b54
1 parent dc7e28c
commit 0e84b54
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,18 +49,17 @@ find_package(catkin REQUIRED COMPONENTS
 # Generate messages in the 'msg' folder
 add_message_files(
   FILES
-  ObjectHypothesis.msg
-  ObjectHypothesisWithPose.msg
-  ClassifierInfo.msg
+  BoundingBox2D.msg
+  BoundingBox3D.msg
   Classification2D.msg
   Classification3D.msg
-  Detection2D.msg
   Detection2DArray.msg
-  Detection3D.msg
+  Detection2D.msg
   Detection3DArray.msg
-
-  BoundingBox2D.msg
-  BoundingBox3D.msg
+  Detection3D.msg
+  ObjectHypothesis.msg
+  ObjectHypothesisWithPose.msg
+  VisionInfo.msg
 )
 
 ## Generate services in the 'srv' folder
@@ -117,7 +116,7 @@ generate_messages(
 catkin_package(
 #  INCLUDE_DIRS include
 #  LIBRARIES vision_msgs
-  CATKIN_DEPENDS std_msgs sensor_msgs geometry_msgs
+  CATKIN_DEPENDS std_msgs sensor_msgs geometry_msgs message_runtime
 #  DEPENDS system_lib
 )
 

diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ classifier information.
 
   * Classification2D and Classification3D: pure classification without pose
   * Detection2D and Detection3D: classification + pose
-  * ClassifierInfo: Information about a classifier, such as its name and where
+  * VisionInfo: Information about a classifier, such as its name and where
   to find its metadata database.
 
 By using a very general message definition, we hope to cover as many of the

diff --git a/msg/Detection2D.msg b/msg/Detection2D.msg
@@ -7,7 +7,7 @@
 Header header
 
 # Class probabilities
-vision_msgs/ObjectHypothesisWithPose[] results
+ObjectHypothesisWithPose[] results
 
 # 2D bounding box surrounding the object.
 BoundingBox2D bbox

diff --git a/msg/Detection2DArray.msg b/msg/Detection2DArray.msg
@@ -2,4 +2,4 @@
 
 # list of the detected proposals. For a multi-proposal detector, this list could
 # have many objects.
-vision_msgs/Detection2D[] detections
+Detection2D[] detections
diff --git a/msg/Detection3D.msg b/msg/Detection3D.msg
@@ -8,7 +8,7 @@ Header header
 
 # Class probabilities. Does not have to include hypotheses for all possible
 # object ids, the scores for any ids not listed are assumed to be 0.
-vision_msgs/ObjectHypothesisWithPose[] results
+ObjectHypothesisWithPose[] results
 
 # 3D bounding box surrounding the object.
 BoundingBox3D bbox

diff --git a/msg/Detection3DArray.msg b/msg/Detection3DArray.msg
@@ -2,4 +2,4 @@
 
 # list of the detected proposals. For a multi-proposal detector, this list could
 # have many objects.
-vision_msgs/Detection3D[] detections
+Detection3D[] detections