Merge pull request #105 from bulwahn/optionally-configure-tests

Optionally configure tests

classes/catkin.bbclass

@@ -19,6 +19,7 @@ EXTRA_OECMAKE_prepend = "\
     ${EXTRA_OECMAKE_CATKIN} \
     -DCATKIN_BUILD_BINARY_PACKAGE=ON \
     -DSETUPTOOLS_DEB_LAYOUT=OFF \
+    -DCATKIN_ENABLE_TESTING=0 \
     "
 
 OECMAKE_SOURCEPATH = "${S}"

recipes-ros/class-loader/class-loader_0.2.0.bb → recipes-ros/class-loader/class-loader_0.2.1.bb

@@ -11,9 +11,14 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz"
-SRC_URI[md5sum] = "b52990244798f849f1c7deb0ef476bd3"
-SRC_URI[sha256sum] = "a6e02d70e64be816af0424ad67c8bba658ced903a19794b3ebe7c0e7f6785c25"
+SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz;name=archive"
+SRC_URI[archive.md5sum] = "e844b2f708946c6245093b30f9f7f3b4"
+SRC_URI[archive.sha256sum] = "93347aca95be80e78253b964f363cd5486fbf17cf939d224b46ed1de8287679d"
+
+SRC_URI += "https://github.com/ros/class_loader/commit/384a880d2dcf1bc51fe62d5c4648756b4575dba3.patch;name=patch"
+SRC_URI[patch.md5sum] = "c95550a5b8197338e57be732b9fa2225"
+SRC_URI[patch.sha256sum] = "9029530d2a62c44e1614483ec312572d7cfa47298c4392b066f802c0454a97bf"
+
 
 DEPENDS = "console-bridge libpoco"
 

recipes-ros/geometry/tf/0001-using-CATKIN_ENABLE_TESTING-to-optionally-configure-.patch

+From 57ad3092284903295e24931adc46af837cef02a2 Mon Sep 17 00:00:00 2001
+From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+Date: Wed, 3 Jul 2013 08:44:00 +0200
+Subject: [PATCH] using CATKIN_ENABLE_TESTING to optionally configure tests in
+ tf
+
+Since ff60599b8077b86a6d75d510da72e69899d16008 in the catkin
+repository, catkin provides to optionally configure tests. This
+commit adjusts the CMakeLists.txt to opt-in the tests.
+Furthermore, it groups static_transformer_publisher to the other
+debug tools and adds some structuring comments in CMakeLists.txt.
+
+This commit is currently needed for cross-compiling tf (without
+tests) in the meta-ros project (github.com/bmwcarit/meta-ros)
+without requiring gtest.
+
+Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+---
+ tf/CMakeLists.txt |   13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt
+index 771257a..1d36679 100644
+--- a/tf/CMakeLists.txt
++++ b/tf/CMakeLists.txt
+@@ -42,6 +42,12 @@ target_link_libraries(tf_change_notifier ${PROJECT_NAME})
+ add_executable(tf_monitor src/tf_monitor.cpp)
+ target_link_libraries(tf_monitor ${PROJECT_NAME})
+ 
++add_executable(static_transform_publisher src/static_transform_publisher.cpp)
++target_link_libraries(static_transform_publisher ${PROJECT_NAME})
++
++# Tests
++if(CATKIN_ENABLE_TESTING)
++
+ catkin_add_gtest(tf_unittest test/tf_unittest.cpp)
+ target_link_libraries(tf_unittest ${PROJECT_NAME})
+ 
+@@ -85,10 +91,11 @@ add_rostest(test/test_broadcaster.launch)
+ 
+ add_executable(testBroadcaster test/testBroadcaster.cpp)
+ target_link_libraries(testBroadcaster ${PROJECT_NAME})
+-add_executable(static_transform_publisher src/static_transform_publisher.cpp)
+-target_link_libraries(static_transform_publisher ${PROJECT_NAME})
++
++endif()
+ 
+ 
++#Python setup
+ set(Python_ADDITIONAL_VERSIONS 2.7)
+ find_package(PythonLibs REQUIRED)
+ include_directories(${PYTHON_INCLUDE_PATH})
+@@ -126,8 +133,10 @@ set_target_properties(pytf_py PROPERTIES OUTPUT_NAME tf PREFIX "_" SUFFIX ".so"
+ # DOES PYUNIT WORK IN CATKIN?
+ target_link_libraries(pytf_py ${Boost_LIBRARIES} ${catkin_LIBRARIES})
+ 
++if(CATKIN_ENABLE_TESTING)
+ add_executable(tf_speed_test EXCLUDE_FROM_ALL test/speed_test.cpp)
+ target_link_libraries(tf_speed_test ${PROJECT_NAME})
++endif()
+ 
+ 
+ install(DIRECTORY include/${PROJECT_NAME}/
+-- 
+1.7.9.5
+

recipes-ros/geometry/tf_1.9.29.bb

@@ -7,3 +7,4 @@ DEPENDS = "angles geometry-msgs message-filters sensor-msgs"
 
 require geometry.inc
 
+SRC_URI += "file://0001-using-CATKIN_ENABLE_TESTING-to-optionally-configure-.patch;striplevel=2"