angles: updating to 1.9.11

This commit is contained in:
dan.jia 2017-04-24 18:47:41 +09:00 committed by Dmitry Rozhkov
parent f541b13cb8
commit bf9786596f
2 changed files with 2 additions and 41 deletions

View File

@ -1,37 +0,0 @@
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
Upstream-Status: Accepted
---
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

@ -4,10 +4,8 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5" LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "c2a841dbeb1f3036449919773ac70876" SRC_URI[md5sum] = "58c8df0f95bd3c1c69d2cd5dd0432ff6"
SRC_URI[sha256sum] = "5e690bf611bead83c2fdcab5a9617b622a9869e55fd1742c00b4015ddf4f8cfc" SRC_URI[sha256sum] = "c453dc462585320e57e4086f47f3be618ec7a2e83610895ccfdbd31d5d4993f4"
SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;striplevel=2"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"