Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

Commit 74adaf3

Browse files
authored
Merge pull request #315 from rojkov/meta-ros-update
meta-ros: pull in latest layer
2 parents 8a32e3b + 23acde3 commit 74adaf3

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
TOOLCHAIN_HOST_TASK_append = " nativesdk-python3-lxml"

meta-refkit-industrial/recipes-ros/robot-model/urdf/0001-Switch-from-TinyXML-to-TinyXML2.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ index f19fb04..b0c76e5 100644
2929

3030
find_package(PkgConfig)
3131
pkg_check_modules(libpcrecpp libpcrecpp)
32-
@@ -26,7 +26,7 @@ configure_file(urdfdom_compatibility.h.in "${generated_compat_header}" @ONLY)
33-
34-
catkin_package(
32+
@@ -28,7 +28,7 @@ catkin_package(
3533
LIBRARIES ${PROJECT_NAME}
36-
- INCLUDE_DIRS include ${TinyXML_INLCLUDE_DIRS} ${CATKIN_DEVEL_PREFIX}/include
37-
+ INCLUDE_DIRS include ${TinyXML2_INLCLUDE_DIRS} ${CATKIN_DEVEL_PREFIX}/include
34+
INCLUDE_DIRS include ${CATKIN_DEVEL_PREFIX}/include
3835
CATKIN_DEPENDS rosconsole_bridge roscpp
39-
DEPENDS urdfdom_headers urdfdom Boost pcrecpp
36+
- DEPENDS urdfdom_headers urdfdom Boost pcrecpp TinyXML
37+
+ DEPENDS urdfdom_headers urdfdom Boost pcrecpp TinyXML2
4038
)
39+
install(FILES ${generated_compat_header} DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
40+
4141
@@ -39,13 +39,13 @@ include_directories(
4242
${catkin_INCLUDE_DIRS}
4343
${urdfdom_INCLUDE_DIRS}

meta-refkit-industrial/recipes-ros/robot-model/urdf_1.11.13.bbappend renamed to meta-refkit-industrial/recipes-ros/robot-model/urdf_1.11.14.bbappend

File renamed without changes.

meta-ros

0 commit comments

Comments
 (0)