From 7e2b6ef64ce5d3708fe8f65ff765fdd5c98cc3db Mon Sep 17 00:00:00 2001 From: Kristof Robot Date: Tue, 25 Feb 2014 19:12:40 +0100 Subject: [PATCH] adjusting to cmake.bbclass changes in OE-Core (resolves #229) --- README.md | 6 +++++- recipes-ros/octomap-ros/octomap-ros_0.3.0.bb | 2 +- recipes-ros/robot-model/collada-urdf_1.10.18.bb | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 70a9a5e..76dc7fb 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,11 @@ cross-compilation of the basic ros-comm packages. Using wildcards in bbappend versions part in name depends on 31bc9af9cd56e7b318924869970e850993fafc5f@bitbake and - 991cbeedbde8bd25ce08c669b1bfac8b99e33149@bitbake + 991cbeedbde8bd25ce08c669b1bfac8b99e33149@bitbake. + + octomap-ros and collada-urdf depend on + 43073569cb67d98c11aa71211d77b566b64f9145@openembedded-core and + 783fb88f476c94d5d4f4b954f7053464d9a6dff5@openembedded-core. ## INSTALLATION ## diff --git a/recipes-ros/octomap-ros/octomap-ros_0.3.0.bb b/recipes-ros/octomap-ros/octomap-ros_0.3.0.bb index c6c5165..d7f1135 100644 --- a/recipes-ros/octomap-ros/octomap-ros_0.3.0.bb +++ b/recipes-ros/octomap-ros/octomap-ros_0.3.0.bb @@ -16,5 +16,5 @@ inherit catkin do_configure_append() { 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/octomap_ros.dir/build.make + ${B}/CMakeFiles/octomap_ros.dir/build.make } diff --git a/recipes-ros/robot-model/collada-urdf_1.10.18.bb b/recipes-ros/robot-model/collada-urdf_1.10.18.bb index 1c1a495..bf1e707 100644 --- a/recipes-ros/robot-model/collada-urdf_1.10.18.bb +++ b/recipes-ros/robot-model/collada-urdf_1.10.18.bb @@ -12,6 +12,6 @@ do_configure_append() { 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 + ${B}/CMakeFiles/$f/build.make done }