chatter: updating to 0.1.1

This commit is contained in:
Lukas Bulwahn 2014-03-19 14:46:09 +01:00
parent 3ca57627a2
commit 97c43ed571
5 changed files with 2 additions and 33 deletions

View File

@ -1,29 +0,0 @@
From 9c9051d1c00164cf2b63e23ad10f24ddce2b0413 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sat, 21 Sep 2013 15:53:17 +0200
Subject: [PATCH] rostest is optional
---
chatter_sender/CMakeLists.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/chatter_sender/CMakeLists.txt b/chatter_sender/CMakeLists.txt
index f2bc563..243bc53 100644
--- a/chatter_sender/CMakeLists.txt
+++ b/chatter_sender/CMakeLists.txt
@@ -1,7 +1,11 @@
cmake_minimum_required(VERSION 2.8.3)
project(chatter_sender)
-find_package(catkin REQUIRED COMPONENTS chatter_msgs roscpp rostest)
+if(CATKIN_ENABLE_TESTING)
+ find_package(catkin REQUIRED COMPONENTS chatter_msgs roscpp rostest)
+else()
+ find_package(catkin REQUIRED COMPONENTS chatter_msgs roscpp)
+endif()
catkin_package()
--
1.7.10.4

View File

@ -6,5 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc
DEPENDS = "chatter-msgs roscpp" DEPENDS = "chatter-msgs roscpp"
require chatter.inc require chatter.inc
SRC_URI += "file://0001-rostest-is-optional.patch;striplevel=2"

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/bmwcarit/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI = "https://github.com/bmwcarit/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "c26fdc13d96d1b65d0c1e03b41572550" SRC_URI[md5sum] = "3048507b90d31babed579677c73aa219"
SRC_URI[sha256sum] = "b18f8a08fe8bdc4d7a89ee9ab15892348c25d508dad1bed87e795805506f315f" SRC_URI[sha256sum] = "ff7f5a705049bd6e312afcbbf919cc5a382160ff6eca8571a7dec4f4e0bc8f15"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"