From b8beeb578c3f9194cabcd9b239896471041f0300 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> Date: Wed, 6 Nov 2013 08:19:29 +0100 Subject: [PATCH] laser-geometry: updating to 1.5.14 The patch to check for CATKIN_ENABLE_TESTING has been included in version 1.5.14. --- ...0001-check-for-CATKIN_ENABLE_TESTING.patch | 43 ------------------- ...try_1.5.13.bb => laser-geometry_1.5.14.bb} | 6 +-- 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 recipes-ros/laser-geometry/laser-geometry/0001-check-for-CATKIN_ENABLE_TESTING.patch rename recipes-ros/laser-geometry/{laser-geometry_1.5.13.bb => laser-geometry_1.5.14.bb} (73%) diff --git a/recipes-ros/laser-geometry/laser-geometry/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/laser-geometry/laser-geometry/0001-check-for-CATKIN_ENABLE_TESTING.patch deleted file mode 100644 index 7cdcee1..0000000 --- a/recipes-ros/laser-geometry/laser-geometry/0001-check-for-CATKIN_ENABLE_TESTING.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4c1945fb38a39b3a139d043dc21cb745f313bcc1 Mon Sep 17 00:00:00 2001 -From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> -Date: Sun, 13 Oct 2013 17:41:58 +0200 -Subject: [PATCH] check for CATKIN_ENABLE_TESTING - ---- - CMakeLists.txt | 6 ++++-- - package.xml | 2 +- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9cee35b..a628238 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,8 +20,10 @@ include_directories(include ${catkin_INCLUDE_DIRS}) - add_library(laser_geometry src/laser_geometry.cpp) - target_link_libraries(laser_geometry ${Boost_LIBRARIES} ${tf_LIBRARIES}) - --catkin_add_gtest(projection_test test/projection_test.cpp) --target_link_libraries(projection_test laser_geometry) -+if(CATKIN_ENABLE_TESTING) -+ catkin_add_gtest(projection_test test/projection_test.cpp) -+ target_link_libraries(projection_test laser_geometry) -+endif() - - install(TARGETS laser_geometry - ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -diff --git a/package.xml b/package.xml -index 83e02e2..b000bde 100644 ---- a/package.xml -+++ b/package.xml -@@ -15,7 +15,7 @@ - - <url>http://ros.org/wiki/laser_geometry</url> - -- <buildtool_depend>catkin</buildtool_depend> -+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend> - - <build_depend>sensor_msgs</build_depend> - <build_depend>roscpp</build_depend> --- -1.8.1.2 - diff --git a/recipes-ros/laser-geometry/laser-geometry_1.5.13.bb b/recipes-ros/laser-geometry/laser-geometry_1.5.14.bb similarity index 73% rename from recipes-ros/laser-geometry/laser-geometry_1.5.13.bb rename to recipes-ros/laser-geometry/laser-geometry_1.5.14.bb index cea47c6..05f83b8 100644 --- a/recipes-ros/laser-geometry/laser-geometry_1.5.13.bb +++ b/recipes-ros/laser-geometry/laser-geometry_1.5.14.bb @@ -8,10 +8,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9de DEPENDS = "angles boost libeigen sensor-msgs roscpp tf" SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" -SRC_URI[md5sum] = "dce0a6f2a6a7eeee3913bb01ff8081e1" -SRC_URI[sha256sum] = "8df2f328bc8dfb7c54d89ffbe832c0f2756864d6baddb39d5ea229be9f52b14d" - -SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch" +SRC_URI[md5sum] = "111534440e0b04a1e269b47dcb806753" +SRC_URI[sha256sum] = "63504536e8f28df2baf11f9cc5cec265c92f2a3b1b717af6e8c6bc6c110d15e3" S = "${WORKDIR}/${ROS_SP}" -- GitLab