Merge pull request #202 from bulwahn/master

resolving some minor issues
2013-11-14 23:46:53 -08:00 · 2013-11-14 23:46:53 -08:00 · 34f78d3fbe
parent 29b4836bb4 27aed4e5a9
commit 34f78d3fbe
3 changed files with 8 additions and 0 deletions
--- a/recipes-extended/assimp/assimp_3.0.1270.bb
+++ b/recipes-extended/assimp/assimp_3.0.1270.bb
@ -12,3 +12,5 @@ SRC_URI[sha256sum] = "ac29beb596db97df57451a5503afaf2d8b4366522842a6914da8964492
 S = "${WORKDIR}/assimp--${PV}-source-only"

 inherit cmake
+
+FILES_${PN}-dev += "${libdir}/cmake/assimp-3.0/*.cmake"
--- a/recipes-extended/collada-dom/collada-dom_2.4.0.bb
+++ b/recipes-extended/collada-dom/collada-dom_2.4.0.bb
@ -15,3 +15,5 @@ EXTRA_OECMAKE += "\
 "

 inherit cmake
+
+FILES_${PN}-dev += "${libdir}/cmake/collada_dom-2.4/*.cmake"
--- a/recipes-ros/octomap/octomap.inc
+++ b/recipes-ros/octomap/octomap.inc
@ -4,6 +4,10 @@ SRC_URI[sha256sum] = "c68b75913ea5ebeb5459eaf2114801477aeaa2a584b018b8816f8a5101

 S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

+EXTRA_OECMAKE += "\
+  -DCMAKE_SKIP_RPATH=ON \
+"
+
 inherit cmake ros

 ROS_SPN = "octomap"