From 00d579a793862293083007979f7adde088fc08ac Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Wed, 6 Feb 2013 07:08:24 +0100 Subject: [PATCH] replacing hard-code pathes with pathes set by bitbake's shell variables --- .../roscpp-serialization/roscpp-serialization_0.3.12.bb | 8 ++++---- recipes-ros/rostime/rostime_0.3.12.bb | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/recipes-ros/roscpp-serialization/roscpp-serialization_0.3.12.bb b/recipes-ros/roscpp-serialization/roscpp-serialization_0.3.12.bb index ae982f7..19fcba2 100644 --- a/recipes-ros/roscpp-serialization/roscpp-serialization_0.3.12.bb +++ b/recipes-ros/roscpp-serialization/roscpp-serialization_0.3.12.bb @@ -14,10 +14,10 @@ DEPENDS = "catkin-native \ roscpp-traits \ rostime" -EXTRA_OECMAKE = \ - " -Dcpp_common_DIR=/home/lukas/poky-danny-8.0/build/tmp/sysroots/qemux86/usr/share/cpp_common/cmake/ \ - -Droscpp_traits_DIR=/home/lukas/poky-danny-8.0/build/tmp/sysroots/qemux86/usr/share/roscpp_traits/cmake/ \ - -Drostime_DIR=/home/lukas/poky-danny-8.0/build/tmp/sysroots/qemux86/usr/share/rostime/cmake/ \ +EXTRA_OECMAKE = " \ + -Dcpp_common_DIR=${STAGING_DATADIR}/cpp_common/cmake/ \ + -Droscpp_traits_DIR=${STAGING_DATADIR}/roscpp_traits/cmake/ \ + -Drostime_DIR=${STAGING_DATADIR}/rostime/cmake/ \ " inherit cmake pythonnative diff --git a/recipes-ros/rostime/rostime_0.3.12.bb b/recipes-ros/rostime/rostime_0.3.12.bb index 4825879..3fbd62b 100644 --- a/recipes-ros/rostime/rostime_0.3.12.bb +++ b/recipes-ros/rostime/rostime_0.3.12.bb @@ -16,5 +16,6 @@ FILES_${PN} += "${libdir}/*" inherit cmake pythonnative -EXTRA_OECMAKE = "-DCMAKE_PREFIX_PATH=/home/lukas/poky-danny-8.0/build/tmp/sysroots/qemux86/usr/share/cpp_common/cmake/ \ - -Dcpp_common_DIR=/home/lukas/poky-danny-8.0/build/tmp/sysroots/qemux86/usr/share/cpp_common/cmake/" +EXTRA_OECMAKE = " \ + -Dcpp_common_DIR=${STAGING_DATADIR}/cpp_common/cmake/ \ + "