Merge pull request #230 from KristofRobot/229

adjusting to cmake.bbclass changes in OE-Core (resolves #229)
This commit is contained in:
Lukas Bulwahn 2014-03-02 19:18:13 +01:00
commit 456fd9248f
3 changed files with 7 additions and 3 deletions

View File

@ -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 ##

View File

@ -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
}

View File

@ -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
}