imu-pipeline: updating to 0.2.2

Due to the update, this commit drops the patch that is not
needed anymore. A slightly different patch has been merged.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
This commit is contained in:
Lukas Bulwahn 2017-03-19 15:08:19 +01:00
parent d78a506f43
commit 3f1d3469a4
4 changed files with 2 additions and 62 deletions

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "095c1dd8ed0fbd5775ba6986f4e4a074" SRC_URI[md5sum] = "13ce3d3c86dbe7f8e7b9eed26c8a7418"
SRC_URI[sha256sum] = "91e0d491bd08dce8629876bf6005a1aaabcb130413ed749c4ab168e17f0118fa" SRC_URI[sha256sum] = "e5138f55e537a88c2c53b12a8bb4cb5b3bfcd247b1c49d8b40d01ce32c33d5b7"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

View File

@ -1,58 +0,0 @@
From 3a821331fb0884607b6c77865ed9fbc1e8197e20 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sat, 28 Feb 2015 20:55:42 +0100
Subject: [PATCH] CMakeLists.txt: check launch file if testing is on
When building with CATKIN_ENABLE_TESTING deactivated, configure
fails with:
| -- Using CATKIN_ENABLE_TESTING: 0
| -- catkin 0.6.14
| -- Using these message generators: gencpp;genlisp;genpy
| CMake Error at /opt/ros/indigo/share/roslaunch/cmake/roslaunch-extras.cmake:35 (catkin_run_tests_target):
| Unknown CMake command "catkin_run_tests_target".
| Call Stack (most recent call first):
| CMakeLists.txt:34 (roslaunch_add_file_check)
|
|
| -- Configuring incomplete, errors occurred!
Configure fails as the test command 'catkin_run_tests_target' is
only defined in catkin if CATKIN_ENABLE_TESTING is enabled.
Hence, this commit changes CMakeLists.txt so that the command is
only used if CATKIN_ENABLE_TESTING is enabled.
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Upstream-Status: Submitted [https://github.com/ros-perception/imu_pipeline/pull/6]
---
imu_transformer/CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/imu_transformer/CMakeLists.txt b/imu_transformer/CMakeLists.txt
index 9a498dc..7a9dfc6 100644
--- a/imu_transformer/CMakeLists.txt
+++ b/imu_transformer/CMakeLists.txt
@@ -5,7 +5,6 @@ find_package(catkin REQUIRED COMPONENTS
message_filters
nodelet
roscpp
- roslaunch
sensor_msgs
geometry_msgs
tf2
@@ -31,7 +30,10 @@ target_link_libraries(imu_transformer_nodelet ${catkin_LIBRARIES})
add_executable(imu_transformer_node src/imu_transformer_node.cpp)
target_link_libraries(imu_transformer_node ${catkin_LIBRARIES})
-roslaunch_add_file_check(launch)
+if(CATKIN_ENABLE_TESTING)
+ find_package(roslaunch REQUIRED)
+ roslaunch_add_file_check(launch)
+endif()
install(TARGETS imu_transformer_node imu_transformer_nodelet
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
--
1.9.3

View File

@ -8,5 +8,3 @@ DEPENDS = "geometry-msgs nodelet message-filters roscpp roslaunch sensor-msgs \
tf2 tf2-ros tf2-sensor-msgs topic-tools" tf2 tf2-ros tf2-sensor-msgs topic-tools"
require imu-pipeline.inc require imu-pipeline.inc
SRC_URI += "file://0001-CMakeLists.txt-check-launch-file-if-testing-is-on.patch;striplevel=2"