p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adjusting to cmake.bbclass changes in OE-Core (resolves #229)

This commit is contained in:
Kristof Robot 2014-02-25 19:12:40 +01:00
parent 7737a04a81
commit 7e2b6ef64c
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -58,7 +58,11 @@ cross-compilation of the basic ros-comm packages.
Using wildcards in bbappend versions part in name depends on Using wildcards in bbappend versions part in name depends on
31bc9af9cd56e7b318924869970e850993fafc5f@bitbake and 31bc9af9cd56e7b318924869970e850993fafc5f@bitbake and
991cbeedbde8bd25ce08c669b1bfac8b99e33149@bitbake 991cbeedbde8bd25ce08c669b1bfac8b99e33149@bitbake.
octomap-ros and collada-urdf depend on
43073569cb67d98c11aa71211d77b566b64f9145@openembedded-core and
783fb88f476c94d5d4f4b954f7053464d9a6dff5@openembedded-core.
## INSTALLATION ## ## INSTALLATION ##

2
recipes-ros/octomap-ros/octomap-ros_0.3.0.bb
View File

@ -16,5 +16,5 @@ inherit catkin
do_configure_append() { do_configure_append() {
sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \ sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \
-e 's: /usr/lib/liboctomath.so: ${STAGING_LIBDIR}/liboctomath.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
} }

2
recipes-ros/robot-model/collada-urdf_1.10.18.bb
View File

@ -12,6 +12,6 @@ do_configure_append() {
do do
sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \ sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \
-e 's: /usr/lib/liboctomath.so: ${STAGING_LIBDIR}/liboctomath.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 done
} }