From 4893478b39cb6d43c63ed1ca8740656d056ce082 Mon Sep 17 00:00:00 2001 From: Stefan Herbrechtsmeier Date: Wed, 14 Aug 2013 14:26:32 +0200 Subject: [PATCH] angles: Include patch in our repository (resolves #146) Signed-off-by: Stefan Herbrechtsmeier --- ...0001-check-for-CATKIN_ENABLE_TESTING.patch | 36 +++++++++++++++++++ .../geometry-angles-utils/angles_1.9.9.bb | 4 +-- 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 recipes-ros/geometry-angles-utils/angles/0001-check-for-CATKIN_ENABLE_TESTING.patch diff --git a/recipes-ros/geometry-angles-utils/angles/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/geometry-angles-utils/angles/0001-check-for-CATKIN_ENABLE_TESTING.patch new file mode 100644 index 0000000..73080d0 --- /dev/null +++ b/recipes-ros/geometry-angles-utils/angles/0001-check-for-CATKIN_ENABLE_TESTING.patch @@ -0,0 +1,36 @@ +From 8b1879e93b8ae2f89df345edaf688521e5c0ab97 Mon Sep 17 00:00:00 2001 +From: Lukas Bulwahn +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 @@ + + http://ros.org/wiki/angles + +- catkin ++ catkin + +-- +1.8.1.6 + diff --git a/recipes-ros/geometry-angles-utils/angles_1.9.9.bb b/recipes-ros/geometry-angles-utils/angles_1.9.9.bb index 3ee1f9f..3f8eb53 100644 --- a/recipes-ros/geometry-angles-utils/angles_1.9.9.bb +++ b/recipes-ros/geometry-angles-utils/angles_1.9.9.bb @@ -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}"