dev-ros/filters: Backport upstream fix to build without rostest when tests are not enabled. Bug #562466.

Package-Manager: portage-2.2.22
This commit is contained in:
Alexis Ballier
2015-10-07 12:47:58 +02:00
parent 6c65c3b723
commit c7ecbb327a
2 changed files with 28 additions and 1 deletions

View File

@@ -0,0 +1,27 @@
commit 5aef0d6619394df17bffe743071295ad041b5794
Author: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Tue Feb 4 16:02:09 2014 +0100
make rostest in CMakeLists optional (ros/rosdistro#3010)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccb54f9..97eea51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(filters)
# Find dependencies
##############################################################################
-find_package(catkin REQUIRED COMPONENTS pluginlib roslib roscpp rosconsole rostest)
+find_package(catkin REQUIRED COMPONENTS pluginlib roslib roscpp rosconsole)
find_package(Boost COMPONENTS system filesystem thread REQUIRED)
include_directories(
@@ -41,6 +41,7 @@ add_library(transfer_function src/transfer_function.cpp)
target_link_libraries(transfer_function ${catkin_LIBRARIES} ${Boost_LIBRARIES})
if(CATKIN_ENABLE_TESTING)
+ find_package(rostest)
# Test median filter
add_executable(median_test EXCLUDE_FROM_ALL test/test_median.cpp )
target_link_libraries(median_test median ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES})

View File

@@ -18,4 +18,4 @@ RDEPEND="dev-ros/roscpp
dev-ros/pluginlib"
DEPEND="${RDEPEND}
test? ( dev-ros/rostest dev-cpp/gtest )"
PATCHES=( "${FILESDIR}/tests.patch" )
PATCHES=( "${FILESDIR}/tests.patch" "${FILESDIR}/rostest.patch" )