From ce9321e2c34ef6b770b6622e7f4ceb0c33b71019 Mon Sep 17 00:00:00 2001
From: Jiaxing Shi <quic_jiaxshi@quicinc.com>
Date: Fri, 28 Jun 2024 11:20:06 +0800
Subject: [PATCH 1/2] {humble}: fix host path is included in cmake files.

Signed-off-by: Jiaxing Shi <quic_jiaxshi@quicinc.com>
---
 .../recipes-bbappends/urdfdom/urdfdom_%.bbappend       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/meta-ros2-humble/recipes-bbappends/urdfdom/urdfdom_%.bbappend b/meta-ros2-humble/recipes-bbappends/urdfdom/urdfdom_%.bbappend
index fbec724e980..5463a2f3e17 100644
--- a/meta-ros2-humble/recipes-bbappends/urdfdom/urdfdom_%.bbappend
+++ b/meta-ros2-humble/recipes-bbappends/urdfdom/urdfdom_%.bbappend
@@ -1,3 +1,13 @@
 # Copyright (c) 2020 LG Electronics, Inc.
 
 inherit ros_insane_dev_so
+
+do_install:append() {
+
+    for i in ${D}${libdir}/${ROS_BPN}/cmake/* ${D}${ros_libdir}/${ROS_BPN}/cmake/*; do
+        if [ -f "$i" ]; then
+            echo "sed -i -e s:${STAGING_DIR_TARGET}:"":g $i"
+            sed -i -e s:${STAGING_DIR_TARGET}:"":g $i
+        fi
+    done
+}
\ No newline at end of file

From 6eaaae4ccdd81996752e6b30dee233f0b8f68b4f Mon Sep 17 00:00:00 2001
From: Jiaxing Shi <quic_jiaxshi@quicinc.com>
Date: Fri, 5 Jul 2024 09:58:16 +0800
Subject: [PATCH 2/2] {humble}: Use CMAKE_SYSROOT to replace HOST path

urdfdom-xxx.cmake will used by other packages in cross compilation.
If HOST path is removed, they cannot find dependencies properly. Use
CMAKE_SYSROOT instead.

Signed-off-by: Jiaxing Shi <quic_jiaxshi@quicinc.com>
---
 meta-ros2-humble/recipes-bbappends/urdfdom/urdfdom_%.bbappend | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ros2-humble/recipes-bbappends/urdfdom/urdfdom_%.bbappend b/meta-ros2-humble/recipes-bbappends/urdfdom/urdfdom_%.bbappend
index 5463a2f3e17..7501bfb4241 100644
--- a/meta-ros2-humble/recipes-bbappends/urdfdom/urdfdom_%.bbappend
+++ b/meta-ros2-humble/recipes-bbappends/urdfdom/urdfdom_%.bbappend
@@ -7,7 +7,7 @@ do_install:append() {
     for i in ${D}${libdir}/${ROS_BPN}/cmake/* ${D}${ros_libdir}/${ROS_BPN}/cmake/*; do
         if [ -f "$i" ]; then
             echo "sed -i -e s:${STAGING_DIR_TARGET}:"":g $i"
-            sed -i -e s:${STAGING_DIR_TARGET}:"":g $i
+            sed -i -e s:${STAGING_DIR_TARGET}:\${CMAKE_SYSROOT}:g $i
         fi
     done
-}
\ No newline at end of file
+}