| 1 |
commit: c7ecbb327a1586d4c6c5ca2e6e45b2efd049db8f |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 7 10:47:58 2015 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 7 10:48:09 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7ecbb32 |
| 7 |
|
| 8 |
dev-ros/filters: Backport upstream fix to build without rostest when tests are not enabled. Bug #562466. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.22 |
| 11 |
|
| 12 |
dev-ros/filters/files/rostest.patch | 27 +++++++++++++++++++++++++++ |
| 13 |
dev-ros/filters/filters-1.7.4.ebuild | 2 +- |
| 14 |
2 files changed, 28 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-ros/filters/files/rostest.patch b/dev-ros/filters/files/rostest.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..6a266fd |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-ros/filters/files/rostest.patch |
| 21 |
@@ -0,0 +1,27 @@ |
| 22 |
+commit 5aef0d6619394df17bffe743071295ad041b5794 |
| 23 |
+Author: Lukas Bulwahn <lukas.bulwahn@×××××××××××××.de> |
| 24 |
+Date: Tue Feb 4 16:02:09 2014 +0100 |
| 25 |
+ |
| 26 |
+ make rostest in CMakeLists optional (ros/rosdistro#3010) |
| 27 |
+ |
| 28 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 29 |
+index ccb54f9..97eea51 100644 |
| 30 |
+--- a/CMakeLists.txt |
| 31 |
++++ b/CMakeLists.txt |
| 32 |
+@@ -5,7 +5,7 @@ project(filters) |
| 33 |
+ # Find dependencies |
| 34 |
+ ############################################################################## |
| 35 |
+ |
| 36 |
+-find_package(catkin REQUIRED COMPONENTS pluginlib roslib roscpp rosconsole rostest) |
| 37 |
++find_package(catkin REQUIRED COMPONENTS pluginlib roslib roscpp rosconsole) |
| 38 |
+ find_package(Boost COMPONENTS system filesystem thread REQUIRED) |
| 39 |
+ |
| 40 |
+ include_directories( |
| 41 |
+@@ -41,6 +41,7 @@ add_library(transfer_function src/transfer_function.cpp) |
| 42 |
+ target_link_libraries(transfer_function ${catkin_LIBRARIES} ${Boost_LIBRARIES}) |
| 43 |
+ |
| 44 |
+ if(CATKIN_ENABLE_TESTING) |
| 45 |
++ find_package(rostest) |
| 46 |
+ # Test median filter |
| 47 |
+ add_executable(median_test EXCLUDE_FROM_ALL test/test_median.cpp ) |
| 48 |
+ target_link_libraries(median_test median ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES}) |
| 49 |
|
| 50 |
diff --git a/dev-ros/filters/filters-1.7.4.ebuild b/dev-ros/filters/filters-1.7.4.ebuild |
| 51 |
index 4b50ee0..d718f2d 100644 |
| 52 |
--- a/dev-ros/filters/filters-1.7.4.ebuild |
| 53 |
+++ b/dev-ros/filters/filters-1.7.4.ebuild |
| 54 |
@@ -18,4 +18,4 @@ RDEPEND="dev-ros/roscpp |
| 55 |
dev-ros/pluginlib" |
| 56 |
DEPEND="${RDEPEND} |
| 57 |
test? ( dev-ros/rostest dev-cpp/gtest )" |
| 58 |
-PATCHES=( "${FILESDIR}/tests.patch" ) |
| 59 |
+PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/rostest.patch" ) |
Archives