From de312214f74340008750febd6794c9824acffa43 Mon Sep 17 00:00:00 2001
From: Tommy Persson <tommmy.persson@liu.se>
Date: Wed, 11 Aug 2021 21:46:28 +0200
Subject: [PATCH] Work on compilation.
---
CMakeLists.txt | 18 +++++++++++++++++-
src/gen_msgs_srvs_acions.py | 2 ++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5667e8..068405b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,6 +152,14 @@ add_custom_target(lrs_task_msgs_gen_files
ALL DEPENDS
${fileprefix}/msg/NavigateSubTask.msg
${fileprefix}/msg/NavigateSubTaskParams.msg
+ ${fileprefix}/msg/SearchAreaTask.msg
+ ${fileprefix}/msg/SearchAreaTaskParams.msg
+ ${fileprefix}/msg/SearchAroundPositionTask.msg
+ ${fileprefix}/msg/SearchAroundPositionTaskParams.msg
+ ${fileprefix}/msg/MoveToTask.msg
+ ${fileprefix}/msg/MoveToTaskParams.msg
+ ${fileprefix}/msg/MovePathTask.msg
+ ${fileprefix}/msg/MovePathTaskParams.msg
# ${PROJECT_SOURCE_DIR}/srv/getrosjsonvalue.cc
# ${PROJECT_SOURCE_DIR}/action/rosjsonparse.h
)
@@ -168,8 +176,16 @@ add_custom_command(
OUTPUT
${fileprefix}/msg/NavigateSubTask.msg
${fileprefix}/msg/NavigateSubTaskParams.msg
+ ${fileprefix}/msg/SearchAreaTask.msg
+ ${fileprefix}/msg/SearchAreaTaskParams.msg
+ ${fileprefix}/msg/SearchAroundPositionTask.msg
+ ${fileprefix}/msg/SearchAroundPositionTaskParams.msg
+ ${fileprefix}/msg/MoveToTask.msg
+ ${fileprefix}/msg/MoveToTaskParams.msg
+ ${fileprefix}/msg/MovePathTask.msg
+ ${fileprefix}/msg/MovePathTaskParams.msg
COMMAND ${codegenbin} --outdir ${fileprefix}
- DEPENDS ${codegenbindep} ${fileprefix}/specs/navigate_sub.json
+ DEPENDS ${codegenbindep} ${fileprefix}/specs/navigate_sub.json ${fileprefix}/specs/search_area.json ${fileprefix}/specs/search_around_position.json ${fileprefix}/specs/move_to.json ${fileprefix}/specs/move_path.json
)
diff --git a/src/gen_msgs_srvs_acions.py b/src/gen_msgs_srvs_acions.py
index 9a3af6a..5b299ba 100755
--- a/src/gen_msgs_srvs_acions.py
+++ b/src/gen_msgs_srvs_acions.py
@@ -24,6 +24,8 @@ def gen_task_params_msg(jobj, prefix):
type = param["type"]
if type == "geopoint":
s += f'geographic_msgs/GeoPoint {name}\n'
+ if type == "geopoints":
+ s += f'geographic_msgs/GeoPoint[] {name}\n'
if type == "float64":
s += f'float64 {name}\n'
if type == "int32":
--
GitLab