angles: Include patch in our repository (resolves #146)

Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
This commit is contained in:
Stefan Herbrechtsmeier 2013-08-14 14:26:32 +02:00 committed by Lukas Bulwahn
parent 4f99b152f1
commit 4893478b39
2 changed files with 37 additions and 3 deletions

View File

@ -0,0 +1,36 @@
From 8b1879e93b8ae2f89df345edaf688521e5c0ab97 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Mon, 15 Jul 2013 14:04:43 +0200
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
---
angles/CMakeLists.txt | 4 +++-
angles/package.xml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/angles/CMakeLists.txt b/angles/CMakeLists.txt
index a2cc37f..4026fc6 100644
--- a/angles/CMakeLists.txt
+++ b/angles/CMakeLists.txt
@@ -10,4 +10,6 @@ install(DIRECTORY include/${PROJECT_NAME}/
include_directories(include)
-add_subdirectory(test)
+if(CATKIN_ENABLE_TESTING)
+ add_subdirectory(test)
+endif()
diff --git a/angles/package.xml b/angles/package.xml
index fe7f848..2409595 100644
--- a/angles/package.xml
+++ b/angles/package.xml
@@ -16,5 +16,5 @@
<url>http://ros.org/wiki/angles</url>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
</package>
--
1.8.1.6

View File

@ -7,9 +7,7 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilena
SRC_URI[md5sum] = "c2a841dbeb1f3036449919773ac70876"
SRC_URI[sha256sum] = "5e690bf611bead83c2fdcab5a9617b622a9869e55fd1742c00b4015ddf4f8cfc"
SRC_URI += "https://github.com/bulwahn/${ROS_SPN}/commit/8b1879e93b8ae2f89df345edaf688521e5c0ab97.patch;striplevel=2;name=patch"
SRC_URI[patch.md5sum] = "d55c70b7328ed6e9d00d3185ddf4b0bf"
SRC_URI[patch.sha256sum] = "2b7303ca01e355680adadd18c3b97dfb1071715375c14a3759ad96f807fc09e5"
SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;striplevel=2"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"