From 97dfb6f7e218442a385488ccc28d88d1bd3fe1c8 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sun, 13 Oct 2013 12:45:06 +0200
Subject: [PATCH] collada-urdf: preliminary solution to #175
After configuring collada-urdf, the recipe modifies the generated
files to address the problem in #175. However, it does not solve
the root of this cause.
---
recipes-ros/robot-model/collada-urdf_1.10.15.bb | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/recipes-ros/robot-model/collada-urdf_1.10.15.bb b/recipes-ros/robot-model/collada-urdf_1.10.15.bb
index 30af6d8..696eaf6 100644
--- a/recipes-ros/robot-model/collada-urdf_1.10.15.bb
+++ b/recipes-ros/robot-model/collada-urdf_1.10.15.bb
@@ -6,3 +6,12 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9de
DEPENDS = "angles assimp resource-retriever collada-dom collada-parser roscpp urdf geometric-shapes"
require robot-model.inc
+
+do_configure_append() {
+ for f in collada_urdf.dir urdf_to_collada.dir
+ do
+ sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \
+ -e 's: /usr/lib/liboctomath.so: ${STAGING_LIBDIR}/liboctomath.so:g' \
+ ${S}/build/CMakeFiles/$f/build.make
+ done
+}
--
GitLab