Skip to content

Commit 5db1ec1

Browse files
committed
Merge branch 'develop'
2 parents 93674f8 + 8eddf55 commit 5db1ec1

File tree

4 files changed

+21
-14
lines changed

4 files changed

+21
-14
lines changed

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# version format
2-
version: 2.14.9-{branch}-build{build}
2+
version: 2.14.10-{branch}-build{build}
33

44
os: Visual Studio 2019
55

doc/source/doxygen-docs/changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
\page changelog Change Log
22

3+
# Version 2.14.10: Released May 23rd, 2025
4+
- BUG FIXES:
5+
- Fix build in ROS rolling: ``Unknown CMake command "ament_target_dependencies".``
6+
37
# Version 2.14.9: Released May 17th, 2025
48
- BUG FIXES:
59
- Fix build with latest tf2 version.

libs/ros2bridge/CMakeLists.txt

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,28 @@ define_mrpt_lib(
4343
# Other imported targets,
4444
# which will be mapped into find_package() commands
4545
# in the xxx_config.cmake script.
46-
rclcpp # find_package() lib names
46+
# find_package() lib names
47+
cv_bridge
48+
geometry_msgs
4749
nav_msgs
48-
stereo_msgs
50+
rclcpp
4951
sensor_msgs
52+
std_msgs
53+
stereo_msgs
5054
tf2
51-
cv_bridge
5255
)
5356

5457
if(BUILD_mrpt-ros2bridge)
5558
# Add the required libraries:
56-
ament_target_dependencies(ros2bridge PUBLIC
57-
rclcpp
58-
tf2
59-
cv_bridge
60-
sensor_msgs
61-
std_msgs
62-
geometry_msgs
63-
stereo_msgs
64-
nav_msgs
59+
target_link_libraries(ros2bridge PUBLIC
60+
${cv_bridge_TARGETS}
61+
${geometry_msgs_TARGETS}
62+
${nav_msgs_TARGETS}
63+
${sensor_msgs_TARGETS}
64+
${std_msgs_TARGETS}
65+
${stereo_msgs_TARGETS}
66+
${tf2_TARGETS}
67+
rclcpp::rclcpp
6568
)
6669

6770
target_compile_definitions(ros2bridge PRIVATE ${ROS_DEFINITIONS})

version_prefix.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
2.14.9
1+
2.14.10
22
# IMPORTANT: This file is parsed by CMake, don't add any comment to
33
# the first line.
44
# This file is used in both Windows and Linux scripts to automatically

0 commit comments

Comments
 (0)