Skip to content

Commit 9cfc21a

Browse files
committed
optimize build system and handle cv_bridge header compatibility for different ROS2 distributions
1 parent 18f02d8 commit 9cfc21a

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ find_package(PCL REQUIRED)
9696
find_package(OpenCV REQUIRED)
9797
find_package(Sophus REQUIRED)
9898
find_package(Boost REQUIRED COMPONENTS thread)
99+
find_package(fmt REQUIRED)
99100
100101
# Include directories for dependencies
101102
include_directories(
@@ -125,7 +126,7 @@ set(dependencies
125126
livox_ros_driver2
126127
)
127128
128-
set(COMMON_DEPENDENCIES OpenMP::OpenMP_CXX)
129+
set(COMMON_DEPENDENCIES OpenMP::OpenMP_CXX fmt::fmt)
129130
130131
# link_directories(${COMMON_DEPENDENCIES}
131132
# ${vikit_common_LIBRARIES}/libvikit_common.so

include/LIVMapper.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ which is included as part of this source code package.
1616
#include "IMU_Processing.h"
1717
#include "vio.h"
1818
#include "preprocess.h"
19+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
20+
#include <cv_bridge/cv_bridge.hpp>
21+
#else
1922
#include <cv_bridge/cv_bridge.h>
23+
#endif
2024
#include <image_transport/image_transport.hpp>
2125
#include <tf2_ros/transform_broadcaster.h>
2226
#include <geometry_msgs/msg/transform_stamped.hpp>

package.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<build_depend>cv_bridge</build_depend>
3535
<build_depend>image_transport</build_depend>
3636
<build_depend>libopencv-dev</build_depend>
37+
<build_depend>sophus</build_depend>
38+
<build_depend>eigen</build_depend>
39+
<build_depend>fmt</build_depend>
3740

3841
<exec_depend>cv_bridge</exec_depend>
3942
<exec_depend>image_transport</exec_depend>

0 commit comments

Comments
 (0)