From a26ba2fb8dba0d33ccd4958c694eb2e5c6c1cc08 Mon Sep 17 00:00:00 2001 From: mitsudome-r Date: Thu, 19 Nov 2020 16:06:27 +0900 Subject: [PATCH] fix perception_launch Signed-off-by: mitsudome-r --- perception_launch/CMakeLists.txt | 14 ++-- ...ra_lidar_fusion_based_detection.launch.xml | 58 ++++++++-------- .../detection/detection.launch.xml | 52 +++++++------- .../lidar_based_detection.launch.xml | 8 +-- .../prediction/prediction.launch.xml | 22 +++--- .../tracking/tracking.launch.xml | 10 +-- .../launch/perception.launch.xml | 67 ++++++++++--------- .../traffic_light.launch.xml | 56 ++++++++-------- perception_launch/package.xml | 1 + 9 files changed, 147 insertions(+), 141 deletions(-) diff --git a/perception_launch/CMakeLists.txt b/perception_launch/CMakeLists.txt index 3617fa63d..1ded711b0 100644 --- a/perception_launch/CMakeLists.txt +++ b/perception_launch/CMakeLists.txt @@ -1,12 +1,10 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.5) project(perception_launch) -find_package(catkin REQUIRED) +find_package(ament_cmake_auto REQUIRED) +ament_auto_find_build_dependencies() -catkin_package() - -install( - DIRECTORY - launch - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} +ament_auto_package( + INSTALL_TO_SHARE + launch ) diff --git a/perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml b/perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml index 27a10be9c..0a3caa08a 100644 --- a/perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml +++ b/perception_launch/launch/object_recognition/detection/camera_lidar_fusion_based_detection.launch.xml @@ -20,43 +20,43 @@ - + - + - - + + - - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + diff --git a/perception_launch/launch/object_recognition/detection/detection.launch.xml b/perception_launch/launch/object_recognition/detection/detection.launch.xml index ae192514c..d67926289 100644 --- a/perception_launch/launch/object_recognition/detection/detection.launch.xml +++ b/perception_launch/launch/object_recognition/detection/detection.launch.xml @@ -23,42 +23,42 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - + - + diff --git a/perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml b/perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml index b51ec4c7a..b4f388d4e 100644 --- a/perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml +++ b/perception_launch/launch/object_recognition/detection/lidar_based_detection.launch.xml @@ -1,9 +1,9 @@ - - - - + + + + diff --git a/perception_launch/launch/object_recognition/prediction/prediction.launch.xml b/perception_launch/launch/object_recognition/prediction/prediction.launch.xml index efd2535b2..86108af8c 100644 --- a/perception_launch/launch/object_recognition/prediction/prediction.launch.xml +++ b/perception_launch/launch/object_recognition/prediction/prediction.launch.xml @@ -3,19 +3,21 @@ - - - - + + + + - - + + + + - - - - + + + + diff --git a/perception_launch/launch/object_recognition/tracking/tracking.launch.xml b/perception_launch/launch/object_recognition/tracking/tracking.launch.xml index a2fc3947b..6383adb45 100644 --- a/perception_launch/launch/object_recognition/tracking/tracking.launch.xml +++ b/perception_launch/launch/object_recognition/tracking/tracking.launch.xml @@ -1,12 +1,12 @@ - + - - - - + + + + diff --git a/perception_launch/launch/perception.launch.xml b/perception_launch/launch/perception.launch.xml index 643ed4834..e908b83f2 100644 --- a/perception_launch/launch/perception.launch.xml +++ b/perception_launch/launch/perception.launch.xml @@ -24,49 +24,56 @@ - + + + - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + - - - + + + + - - + + + diff --git a/perception_launch/launch/traffic_light_recognition/traffic_light.launch.xml b/perception_launch/launch/traffic_light_recognition/traffic_light.launch.xml index 9ae29a49b..931cafd8d 100644 --- a/perception_launch/launch/traffic_light_recognition/traffic_light.launch.xml +++ b/perception_launch/launch/traffic_light_recognition/traffic_light.launch.xml @@ -7,47 +7,45 @@ - - + + - - - - + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/perception_launch/package.xml b/perception_launch/package.xml index ed817f492..db4b9e5f1 100644 --- a/perception_launch/package.xml +++ b/perception_launch/package.xml @@ -11,6 +11,7 @@ ament_cmake_auto dynamic_object_visualization + image_transport_plugins