Merge branch 'develop'

Author: jlblancoc

cmakemodules/script_ros.cmake

@@ -146,7 +146,6 @@ if (NOT DISABLE_ROS)
 	# Convert package versions to hex so they can be used in preprocessor for wider
 	# versions compatibility of "one-source for all":
 	mrpt_version_to_hex(cv_bridge_VERSION  cv_bridge_VERSION_HEX)
-	mrpt_version_to_hex(tf2_VERSION  tf2_VERSION_HEX)
 
 
 	# Kinda hack to prevent build farm to time out for "dev" jobs:

doc/source/doxygen-docs/changelog.md

@@ -1,5 +1,9 @@
 \page changelog Change Log
 
+# Version 2.14.11: Released May 31rd, 2025
+- BUG FIXES:
+  - Fix build against all tf2 versions in all active ROS 2 distributions.
+
 # Version 2.14.10: Released May 23rd, 2025
 - BUG FIXES:
   - Fix build in ROS rolling: ``Unknown CMake command "ament_target_dependencies".``

libs/ros2bridge/CMakeLists.txt

@@ -70,5 +70,4 @@ if(BUILD_mrpt-ros2bridge)
 	target_compile_definitions(ros2bridge PRIVATE ${ROS_DEFINITIONS})
 	target_compile_definitions(ros2bridge PRIVATE IS_MRPT_ROS2BRIDGE)
 	target_compile_definitions(ros2bridge PRIVATE CV_BRIDGE_VERSION=${cv_bridge_VERSION_HEX})
-	target_compile_definitions(ros2bridge PRIVATE TF2_VERSION=${tf2_VERSION_HEX})
 endif()

libs/ros2bridge/include/mrpt/ros2bridge/pose.h

@@ -15,17 +15,11 @@
 #include <mrpt/math/TPose3D.h>
 #include <mrpt/poses/poses_frwds.h>
 
-#if TF2_VERSION >= 0x004201
-#include <tf2/LinearMath/Matrix3x3.hpp>
-#include <tf2/LinearMath/Transform.hpp>
-#else
-#include <tf2/LinearMath/Matrix3x3.h>
-#include <tf2/LinearMath/Transform.h>
-#endif
-
 #include <cstring>  // size_t
 #include <geometry_msgs/msg/pose_with_covariance.hpp>
 #include <geometry_msgs/msg/quaternion.hpp>
+#include <tf2/LinearMath/Matrix3x3.hpp>
+#include <tf2/LinearMath/Transform.hpp>
 
 namespace mrpt::ros2bridge
 {

libs/ros2bridge/src/pose.cpp

@@ -43,11 +43,7 @@
 #include <mrpt/poses/CPosePDFGaussianInf.h>
 #include <mrpt/ros2bridge/pose.h>
 
-#if TF2_VERSION >= 0x004201
 #include <tf2/LinearMath/Matrix3x3.hpp>
-#else
-#include <tf2/LinearMath/Matrix3x3.h>
-#endif
 
 // MRPT -> ROS functions:
 tf2::Matrix3x3 mrpt::ros2bridge::toROS(const mrpt::math::CMatrixDouble33& src)

version_prefix.txt

@@ -1,4 +1,4 @@
-2.14.10
+2.14.11
 # IMPORTANT: This file is parsed by CMake, don't add any comment to
 # the first line.
 # This file is used in both Windows and Linux scripts to automatically