From e913a1580e9af11860b755ab16d62a3282eb95f6 Mon Sep 17 00:00:00 2001 From: Mederic Fourmy <mederic.fourmy@gmail.com> Date: Sat, 14 May 2022 18:28:24 +0200 Subject: [PATCH] Cleaner includes and compilation files --- CMakeLists.txt | 5 +---- include/publisher_vision.h | 12 ++++++++---- include/subscriber_camera.h | 22 ++++++++++++---------- package.xml | 6 ------ 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 963f324..e57fb00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,12 +11,9 @@ find_package(catkin REQUIRED COMPONENTS roscpp rospy sensor_msgs - std_msgs - tf - dynamic_reconfigure - wolf_ros_node cv_bridge image_transport + wolf_ros_node ) diff --git a/include/publisher_vision.h b/include/publisher_vision.h index 4a1ddb4..08405e9 100644 --- a/include/publisher_vision.h +++ b/include/publisher_vision.h @@ -23,15 +23,19 @@ #define PUBLISHER_VISION_DEBUG_H_ +/************************** + * WOLF ROS includes * + **************************/ +#include "publisher.h" + + /************************** * WOLF includes * **************************/ -#include "core/common/wolf.h" -#include "vision/processor/processor_visual_odometry.h" +#include <core/common/wolf.h> +#include <vision/processor/processor_visual_odometry.h> #include <core/utils/params_server.h> -#include "publisher.h" - /************************** * ROS includes * **************************/ diff --git a/include/subscriber_camera.h b/include/subscriber_camera.h index c9e67e3..1fc4049 100644 --- a/include/subscriber_camera.h +++ b/include/subscriber_camera.h @@ -22,15 +22,21 @@ #ifndef SUBSCRIBER_CAMERA_H_ #define SUBSCRIBER_CAMERA_H_ +/************************** + * WOLF-ROS includes * + **************************/ +#include "subscriber.h" + + /************************** * WOLF includes * **************************/ -#include "core/yaml/parser_yaml.h" -#include "core/common/wolf.h" -#include "core/problem/problem.h" -#include "core/utils/params_server.h" -#include "vision/capture/capture_image.h" -#include "vision/sensor/sensor_camera.h" +#include <core/yaml/parser_yaml.h> +#include <core/common/wolf.h> +#include <core/problem/problem.h> +#include <core/utils/params_server.h> +#include <vision/capture/capture_image.h> +#include <vision/sensor/sensor_camera.h> /************************** * ROS includes * @@ -46,10 +52,6 @@ #include <iomanip> #include <queue> -/************************** - * WOLF-ROS includes * - **************************/ -#include "subscriber.h" namespace wolf { diff --git a/package.xml b/package.xml index 7e5705b..14af181 100644 --- a/package.xml +++ b/package.xml @@ -13,20 +13,14 @@ <build_depend>roscpp</build_depend> <build_depend>rospy</build_depend> <build_depend>sensor_msgs</build_depend> - <build_depend>std_msgs</build_depend> - <build_depend>tf</build_depend> <build_depend>wolf_ros_node</build_depend> <build_export_depend>roscpp</build_export_depend> <build_export_depend>sensor_msgs</build_export_depend> - <build_export_depend>std_msgs</build_export_depend> - <build_export_depend>tf</build_export_depend> <exec_depend>roscpp</exec_depend> <exec_depend>rospy</exec_depend> <exec_depend>sensor_msgs</exec_depend> - <exec_depend>std_msgs</exec_depend> - <exec_depend>tf</exec_depend> <exec_depend>wolf_ros_node</exec_depend> <export> -- GitLab