robot-model: replacing previous patches by upstream patch

2013-10-13 06:23:27 +02:00 · 2013-10-13 06:23:27 +02:00 · 1f5d6a7020
parent c6a1af7e0c
commit 1f5d6a7020
6 changed files with 141 additions and 59 deletions
--- a/recipes-ros/robot-model/files/eec215e06c1ceb0d3cb43a0863441d872056d239.patch
+++ b/recipes-ros/robot-model/files/eec215e06c1ceb0d3cb43a0863441d872056d239.patch
@ -0,0 +1,139 @@
+From eec215e06c1ceb0d3cb43a0863441d872056d239 Mon Sep 17 00:00:00 2001
+From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+Date: Sun, 15 Sep 2013 14:35:12 +0200
+Subject: [PATCH] check for CATKIN_ENABLE_TESTING
+
+---
+ collada_urdf/CMakeLists.txt       | 8 +++++---
+ collada_urdf/package.xml          | 2 +-
+ kdl_parser/CMakeLists.txt         | 6 ++++--
+ kdl_parser/package.xml            | 2 +-
+ resource_retriever/CMakeLists.txt | 4 +++-
+ resource_retriever/package.xml    | 2 +-
+ urdf/CMakeLists.txt               | 6 ++++--
+ urdf/package.xml                  | 2 +-
+ 8 files changed, 20 insertions(+), 12 deletions(-)
+
+diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt
+index 9d0e228..05217be 100644
+--- a/collada_urdf/CMakeLists.txt
+++ b/collada_urdf/CMakeLists.txt
+@@ -65,9 +65,11 @@ target_link_libraries(collada_to_urdf ${ASSIMP_LIBRARIES} ${catkin_LIBRARIES} ${
+ set_target_properties(collada_to_urdf PROPERTIES COMPILER_FLAGS "${ASSIMP_CXX_FLAGS} ${ASSIMP_CFLAGS_OTHER}")
+ set_target_properties(collada_to_urdf PROPERTIES LINK_FLAGS "${ASSIMP_LINK_FLAGS}")
+ 
+-catkin_add_gtest(test_collada_writer test/test_collada_urdf.cpp)
+-target_link_libraries(test_collada_writer ${PROJECT_NAME} ${catkin_LIBRARIES} ${COLLADA_DOM_LIBRARIES}  
+-  ${Boost_LIBRARIES})
+if(CATKIN_ENABLE_TESTING)
+  catkin_add_gtest(test_collada_writer test/test_collada_urdf.cpp)
+  target_link_libraries(test_collada_writer ${PROJECT_NAME} ${catkin_LIBRARIES} ${COLLADA_DOM_LIBRARIES}  
+    ${Boost_LIBRARIES})
+endif()
+ 
+ install(TARGETS ${PROJECT_NAME} urdf_to_collada collada_to_urdf
+   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+diff --git a/collada_urdf/package.xml b/collada_urdf/package.xml
+index a846861..8cde4fe 100644
+--- a/collada_urdf/package.xml
+++ b/collada_urdf/package.xml
+@@ -16,7 +16,7 @@
+ 
+   <url type="website">http://ros.org/wiki/collada_urdf</url>
+ 
+-  <buildtool_depend>catkin</buildtool_depend>
+  <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
+ 
+   <build_depend>angles</build_depend>
+   <build_depend>assimp</build_depend>
+diff --git a/kdl_parser/CMakeLists.txt b/kdl_parser/CMakeLists.txt
+index 7522ac3..3b8ff1d 100644
+--- a/kdl_parser/CMakeLists.txt
+++ b/kdl_parser/CMakeLists.txt
+@@ -31,8 +31,10 @@ target_link_libraries(${PROJECT_NAME}
+ add_executable(check_kdl_parser src/check_kdl_parser.cpp )
+ target_link_libraries(check_kdl_parser ${PROJECT_NAME})
+ 
+-catkin_add_gtest(test_kdl_parser test/test_kdl_parser.cpp )
+-target_link_libraries(test_kdl_parser ${PROJECT_NAME})
+if(CATKIN_ENABLE_TESTING)
+  catkin_add_gtest(test_kdl_parser test/test_kdl_parser.cpp )
+  target_link_libraries(test_kdl_parser ${PROJECT_NAME})
+endif()
+ 
+ # How does CATKIN do this?
+ #rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_kdl_parser.launch)
+diff --git a/kdl_parser/package.xml b/kdl_parser/package.xml
+index a82798a..e977f03 100644
+--- a/kdl_parser/package.xml
+++ b/kdl_parser/package.xml
+@@ -17,7 +17,7 @@
+   <url type="repository">https://github.com/ros/robot_model</url>
+   <url type="bugtracker">https://github.com/ros/robot_model/issues</url>
+ 
+-  <buildtool_depend>catkin</buildtool_depend>
+  <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
+ 
+   <build_depend>orocos_kdl</build_depend>
+   <build_depend>rosconsole</build_depend>
+diff --git a/resource_retriever/CMakeLists.txt b/resource_retriever/CMakeLists.txt
+index 6e67160..f34b0da 100644
+--- a/resource_retriever/CMakeLists.txt
+++ b/resource_retriever/CMakeLists.txt
+@@ -26,7 +26,9 @@ include_directories(${CURL_INCLUDE_DIRS})
+ add_library(${PROJECT_NAME} src/retriever.cpp)
+ target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${catkin_LIBRARIES})
+ 
+-add_subdirectory(test EXCLUDE_FROM_ALL)
+if(CATKIN_ENABLE_TESTING)
+  add_subdirectory(test EXCLUDE_FROM_ALL)
+endif()
+ 
+ install(TARGETS ${PROJECT_NAME}
+   DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
+diff --git a/resource_retriever/package.xml b/resource_retriever/package.xml
+index 562dff4..6e98408 100644
+--- a/resource_retriever/package.xml
+++ b/resource_retriever/package.xml
+@@ -19,7 +19,7 @@
+   <url type="repository">https://github.com/ros/robot_model</url>
+   <url type="bugtracker">https://github.com/ros/robot_model/issues</url>
+ 
+-  <buildtool_depend>catkin</buildtool_depend>
+  <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
+ 
+   <build_depend>curl</build_depend>
+   <build_depend>rosconsole</build_depend>
+diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
+index 5fde363..7b07226 100644
+--- a/urdf/CMakeLists.txt
+++ b/urdf/CMakeLists.txt
+@@ -33,8 +33,10 @@ if(APPLE)
+   set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif(APPLE)
+ 
+-catkin_add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp)
+-target_link_libraries(test_parser ${PROJECT_NAME})
+if(CATKIN_ENABLE_TESTING)
+  catkin_add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp)
+  target_link_libraries(test_parser ${PROJECT_NAME})
+endif()
+ 
+ # no idea how CATKIN does this
+ # rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_robot_model_parser.launch)
+diff --git a/urdf/package.xml b/urdf/package.xml
+index b623dfd..daf04a6 100644
+--- a/urdf/package.xml
+++ b/urdf/package.xml
+@@ -17,7 +17,7 @@
+   <url type="repository">https://github.com/ros/robot_model</url>
+   <url type="bugtracker">https://github.com/ros/robot_model/issues</url>
+ 
+-  <buildtool_depend>catkin</buildtool_depend>
+  <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
+ 
+   <build_depend>rosconsole_bridge</build_depend>
+   <build_depend>roscpp</build_depend>
+-- 
+1.8.4
+
--- a/recipes-ros/robot-model/resource-retriever/0001-resource_retriever-test-CMakeLists.txt-fix.patch
+++ b/recipes-ros/robot-model/resource-retriever/0001-resource_retriever-test-CMakeLists.txt-fix.patch
@ -1,25 +0,0 @@
-From dcc52b56eaade728f92356dd96f7d4cd2c95057e Mon Sep 17 00:00:00 2001
-From: vmayoral <v.mayoralv@gmail.com>
-Date: Fri, 9 Aug 2013 17:57:43 +0200
-Subject: [PATCH] resource_retriever test/CMakeLists.txt fix
-
---
- resource_retriever/test/CMakeLists.txt |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/resource_retriever/test/CMakeLists.txt b/resource_retriever/test/CMakeLists.txt
-index f133bf6..5e0ce18 100644
--- a/resource_retriever/test/CMakeLists.txt
-+++ b/resource_retriever/test/CMakeLists.txt
-@@ -1,4 +1,6 @@
- set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR})
- 
-catkin_add_gtest(${PROJECT_NAME}_utest test.cpp)
-target_link_libraries(${PROJECT_NAME}_utest ${PROJECT_NAME})
-+if(CATKIN_ENABLE_TESTING)
-+    catkin_add_gtest(${PROJECT_NAME}_utest test.cpp)
-+    target_link_libraries(${PROJECT_NAME}_utest ${PROJECT_NAME})
-+endif()
-- 
-1.7.9.5
-
--- a/recipes-ros/robot-model/resource-retriever_1.10.15.bb
+++ b/recipes-ros/robot-model/resource-retriever_1.10.15.bb
@ -6,6 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9de
 DEPENDS = "curl rosconsole roslib"

 require robot-model.inc
-
-SRC_URI += "file://0001-resource_retriever-test-CMakeLists.txt-fix.patch;striplevel=2"
-
--- a/recipes-ros/robot-model/robot-model.inc
+++ b/recipes-ros/robot-model/robot-model.inc
@ -2,6 +2,8 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilena
 SRC_URI[md5sum] = "8408e5b990d157d1d30e56cc0a1ec28c"
 SRC_URI[sha256sum] = "72374d3c43a2715a743365be186fddd23f016889430b5da1209f5bcaba08d141"

+SRC_URI += "file://eec215e06c1ceb0d3cb43a0863441d872056d239.patch;patchdir=.."
+
 S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

 inherit catkin
--- a/recipes-ros/robot-model/urdf/0001-urdf-CMakeLists-fix.patch
+++ b/recipes-ros/robot-model/urdf/0001-urdf-CMakeLists-fix.patch
@ -1,29 +0,0 @@
-From 5a06a8525da6c0721f9a356ac631bc527b591f12 Mon Sep 17 00:00:00 2001
-From: vmayoral <v.mayoralv@gmail.com>
-Date: Fri, 9 Aug 2013 17:46:44 +0200
-Subject: [PATCH] urdf CMakeLists fix
-
---
- urdf/CMakeLists.txt |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
-index 0afcb03..3448c05 100644
--- a/urdf/CMakeLists.txt
-+++ b/urdf/CMakeLists.txt
-@@ -29,8 +29,10 @@ if(APPLE)
-   set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
- endif(APPLE)
- 
-catkin_add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp)
-target_link_libraries(test_parser ${PROJECT_NAME})
-+if(CATKIN_ENABLE_TESTING)
-+    catkin_add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp)
-+    target_link_libraries(test_parser ${PROJECT_NAME})
-+endif()
- 
- # no idea how CATKIN does this
- # rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_robot_model_parser.launch)
-- 
-1.7.9.5
-
--- a/recipes-ros/robot-model/urdf_1.10.15.bb
+++ b/recipes-ros/robot-model/urdf_1.10.15.bb
@ -6,5 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9de
 DEPENDS = "rosconsole-bridge roscpp urdfdom-headers urdf-parser-plugin pluginlib urdfdom cmake-modules libtinyxml"

 require robot-model.inc
-
-SRC_URI += "file://0001-urdf-CMakeLists-fix.patch;striplevel=2"