From f7815b491449ac15496649de7d4207c5eaf79b8c Mon Sep 17 00:00:00 2001
From: Cyrille Berger <cyrille.berger@liu.se>
Date: Mon, 6 May 2024 12:14:07 +0200
Subject: [PATCH] fix compilation with humble
---
CMakeLists.txt | 6 ++++++
include/air_navigation/python_controller.h | 4 ++--
src/python_controller.cpp | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92945cf..a78e594 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,9 @@ endif()
find_package(ament_cmake REQUIRED)
find_package(ament_cmake_python REQUIRED)
find_package(nav2_dwb_controller REQUIRED)
+find_package(dwb_msgs REQUIRED)
+find_package(map_msgs REQUIRED)
+find_package(nav_2d_msgs REQUIRED)
find_package(rclcpp REQUIRED)
find_package(pluginlib REQUIRED)
find_package(nav2_core REQUIRED)
@@ -35,6 +38,9 @@ set(dependencies
nav2_dwb_controller
pluginlib
nav2_util
+ map_msgs
+ nav_2d_msgs
+ dwb_msgs
)
add_library(air_navigation SHARED
diff --git a/include/air_navigation/python_controller.h b/include/air_navigation/python_controller.h
index ceaf903..07b2d20 100644
--- a/include/air_navigation/python_controller.h
+++ b/include/air_navigation/python_controller.h
@@ -23,8 +23,8 @@ public:
void configure(
const rclcpp_lifecycle::LifecycleNode::WeakPtr & parent,
- std::string name, const std::shared_ptr<tf2_ros::Buffer> & tf,
- const std::shared_ptr<nav2_costmap_2d::Costmap2DROS> & costmap_ros);
+ std::string name, std::shared_ptr<tf2_ros::Buffer> tf,
+ std::shared_ptr<nav2_costmap_2d::Costmap2DROS>) override;
void cleanup() override;
diff --git a/src/python_controller.cpp b/src/python_controller.cpp
index 5961d31..a015225 100644
--- a/src/python_controller.cpp
+++ b/src/python_controller.cpp
@@ -15,8 +15,8 @@ using namespace air_navigation;
void PythonController::configure(
const rclcpp_lifecycle::LifecycleNode::WeakPtr & parent,
- std::string name, const std::shared_ptr<tf2_ros::Buffer> &,
- const std::shared_ptr<nav2_costmap_2d::Costmap2DROS> &)
+ std::string name, std::shared_ptr<tf2_ros::Buffer> ,
+ std::shared_ptr<nav2_costmap_2d::Costmap2DROS>)
{
auto node = parent.lock();
RCLCPP_ERROR_STREAM(node->get_logger(), "Configuring Python controller");
--
GitLab