Merge pull request #171 from bulwahn/master

many recipe contributions, updates and minor clean-up
This commit is contained in:
herbrechtsmeier 2013-10-16 11:38:16 -07:00
commit 64067888bd
114 changed files with 905 additions and 402 deletions

3
README
View File

@ -106,9 +106,6 @@ REDISTRIBUTIONS
The log4cxx recipe originated from the recipe in the OpenEmbedded (Classic) Development
(cf. http://cgit.openembedded.org/openembedded/tree/recipes/log4cxx)
licensed with the MIT License.
The eigen recipe originated from the recipe in Kartik Mohta's OpenEmbedded layer
(cf. https://github.com/kartikmohta/meta-km/tree/master/recipes-extended/eigen)
licensed with the MIT License.
The yaml-cpp recipe originated from the recipe in Kartik Mohta's OpenEmbedded layer
(cf. https://github.com/kartikmohta/meta-km/blob/master/recipes-devtools/yaml-cpp/yaml-cpp_0.3.0.bb)
licensed with the MIT License.

View File

@ -0,0 +1,14 @@
DESCRIPTION = "Open Asset Import Library"
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=bc4231a2268da8fc55525ad119638a87"
DEPENDS = "boost"
SRC_URI = "http://sourceforge.net/projects/assimp/files/assimp-3.0/assimp--${PV}-source-only.zip"
SRC_URI[md5sum] = "52aa4cf4e34e6b2a9c5f6c0b3c319af1"
SRC_URI[sha256sum] = "ac29beb596db97df57451a5503afaf2d8b4366522842a6914da89644927a1423"
S = "${WORKDIR}/assimp--${PV}-source-only"
inherit cmake

View File

@ -10,4 +10,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tgz"
SRC_URI[md5sum] = "20399de4206eab850c32e65c04e907cb"
SRC_URI[sha256sum] = "5ca2d12f744bdceff0066ed3067b3b23d6859581fb0d657f98ba4487d8fa3896"
EXTRA_OECMAKE += "\
-DCMAKE_SKIP_RPATH=ON \
"
inherit cmake

View File

@ -1,22 +0,0 @@
DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms."
AUTHOR = "Benoît Jacob and Gaël Guennebaud and others"
HOMEPAGE = "http://eigen.tuxfamily.org/"
LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad"
PR = "r0"
SRC_URI = "http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2"
inherit cmake
OECMAKE_SOURCEPATH = ".."
OECMAKE_BUILDPATH = "build"
EXTRA_OECMAKE += "-Dpkg_config_libdir=${libdir}"
FILES_${PN} = "${includedir} ${libdir}"
# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"

View File

@ -1,10 +0,0 @@
require eigen.inc
PR = "r0"
SRC_URI += "file://eigen-disable-tests.patch"
SRC_URI[md5sum] = "43eee0e9252a77149d6b65e93e73b79d"
SRC_URI[sha256sum] = "1a443145f321dd47a5ca11f176e7319056198a6124a7577723d92e3c3cd59ece"
S = "${WORKDIR}/eigen-eigen-2249f9c22fe8"

View File

@ -1,75 +0,0 @@
eigen: don't try building tests
While configuring, if the tests are enabled, it checks some machine specific
stuff which we don't want to do while cross-compiling.
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Kartik Mohta <kartikmohta@gmail.com>
--- a/CMakeLists.txt~ 2012-07-02 20:33:20.330773075 -0400
+++ b/CMakeLists.txt 2012-07-02 20:34:23.515778505 -0400
@@ -307,24 +307,24 @@
add_subdirectory(doc EXCLUDE_FROM_ALL)
-include(EigenConfigureTesting)
+#include(EigenConfigureTesting)
# fixme, not sure this line is still needed:
-enable_testing() # must be called from the root CMakeLists, see man page
+#enable_testing() # must be called from the root CMakeLists, see man page
-if(EIGEN_LEAVE_TEST_IN_ALL_TARGET)
- add_subdirectory(test) # can't do EXCLUDE_FROM_ALL here, breaks CTest
-else()
- add_subdirectory(test EXCLUDE_FROM_ALL)
-endif()
-
-if(EIGEN_LEAVE_TEST_IN_ALL_TARGET)
- add_subdirectory(blas)
- add_subdirectory(lapack)
-else()
- add_subdirectory(blas EXCLUDE_FROM_ALL)
- add_subdirectory(lapack EXCLUDE_FROM_ALL)
-endif()
+#if(EIGEN_LEAVE_TEST_IN_ALL_TARGET)
+# add_subdirectory(test) # can't do EXCLUDE_FROM_ALL here, breaks CTest
+#else()
+# add_subdirectory(test EXCLUDE_FROM_ALL)
+#endif()
+
+#if(EIGEN_LEAVE_TEST_IN_ALL_TARGET)
+# add_subdirectory(blas)
+# add_subdirectory(lapack)
+#else()
+# add_subdirectory(blas EXCLUDE_FROM_ALL)
+# add_subdirectory(lapack EXCLUDE_FROM_ALL)
+#endif()
add_subdirectory(unsupported)
@@ -342,7 +342,7 @@
add_subdirectory(bench/spbench EXCLUDE_FROM_ALL)
endif(NOT WIN32)
-ei_testing_print_summary()
+#ei_testing_print_summary()
message(STATUS "")
message(STATUS "Configured Eigen ${EIGEN_VERSION_NUMBER}")
--- a/unsupported/CMakeLists.txt~ 2012-07-02 20:33:58.775385403 -0400
+++ b/unsupported/CMakeLists.txt 2012-07-02 20:34:06.495509672 -0400
@@ -1,7 +1,7 @@
add_subdirectory(Eigen)
add_subdirectory(doc EXCLUDE_FROM_ALL)
-if(EIGEN_LEAVE_TEST_IN_ALL_TARGET)
- add_subdirectory(test) # can't do EXCLUDE_FROM_ALL here, breaks CTest
-else()
- add_subdirectory(test EXCLUDE_FROM_ALL)
-endif()
+#if(EIGEN_LEAVE_TEST_IN_ALL_TARGET)
+# add_subdirectory(test) # can't do EXCLUDE_FROM_ALL here, breaks CTest
+#else()
+# add_subdirectory(test EXCLUDE_FROM_ALL)
+#endif()

View File

@ -10,4 +10,8 @@ SRC_URI[sha256sum] = "a35ecaa610550b7f05c3ce373d89c30cf74b059a69880f03080c556dae
CFLAGS += "-fPIC"
EXTRA_OECMAKE += "\
-DCMAKE_SKIP_RPATH=ON \
"
inherit cmake

View File

@ -4,7 +4,7 @@ HOMEPAGE = "http://www.wxwidgets.org"
LICENSE = "wxWindows"
LIC_FILES_CHKSUM = "file://docs/licence.txt;md5=18346072db6eb834b6edbd2cdc4f109b"
DEPENDS = "webkit-gtk gstreamer gtk+ jpeg tiff libpng zlib expat libxinerama mesa-dri"
DEPENDS = "webkit-gtk gstreamer gtk+ jpeg tiff libpng zlib expat libxinerama libglu"
SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxWidgets-${PV}.tar.bz2"
SRC_URI[md5sum] = "e98c5f92805493f150656403ffef3bb0"

View File

@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc
DEPENDS = "cmake python-empy python-catkin-pkg python-empy-native python-catkin-pkg-native"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "da0c0d550105f3a120d110eb01a2d7bd"
SRC_URI[sha256sum] = "5e6dcf66eefbf01d71dd649d3c391e51c388c14517ca2e892d45ba77c63ecc46"
SRC_URI[md5sum] = "9a8d3d23dc43a82d97cfd222cdd13097"
SRC_URI[sha256sum] = "ee26b91306332a19422570cd4cc31261c93f01104df45c42e7a1545fe3ea3ac2"
SRC_URI += "file://0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch"

View File

@ -0,0 +1,12 @@
DESCRIPTION = "Convex Decomposition Tool for Robot Model"
SECTION = "devel"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=58e54c03ca7f821dd3967e2a2cd1596e"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "c3e3f14cec67ccfd2e569b025ffeb3b5"
SRC_URI[sha256sum] = "6f382de77af6fc8bf203338f6a95dd4f2603c6e4a5e30c47951cc53135f5a35f"
S = "${WORKDIR}/${ROS_SP}"
inherit catkin

View File

@ -0,0 +1,12 @@
DESCRIPTION = "This package provides a set of typedef's that allow using Eigen datatypes in STL containers."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "6ceee153cf07b27c94cbadfab0a08c3e"
SRC_URI[sha256sum] = "7ae3464121d1e6da8cc2829fad78b39687f75905cb7b56ff8d9f967cacb09a7f"
S = "${WORKDIR}/${ROS_SP}"
inherit catkin

View File

@ -0,0 +1,9 @@
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "1a8ae6b09936f75bf2bdb8300b46fb2f"
SRC_URI[sha256sum] = "12da6987a028b49dab269105519a4b23ce3a67cfeba475cd5b2b35ea8b23adf4"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
inherit catkin
ROS_SPN = "executive_smach"

View File

@ -0,0 +1,8 @@
DESCRIPTION = "this package contains a set of messages that are used by the introspection interfaces for smach."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "message-generation std-msgs roscpp-serialization"
require executive-smach.inc

View File

@ -0,0 +1,6 @@
DESCRIPTION = "The smach_ros package contains extensions for the SMACH library to integrate it tightly with ROS."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=17;endline=17;md5=d566ef916e9dedc494f5f793a6690ba5"
require executive-smach.inc

View File

@ -0,0 +1,6 @@
DESCRIPTION = "SMACH is a task-level architecture for rapidly creating complex robot behavior."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9dedc494f5f793a6690ba5"
require executive-smach.inc

View File

@ -0,0 +1,106 @@
From 2607c82034cdfbf96fe372c9637b0133b6ba6970 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sat, 12 Oct 2013 11:39:36 +0200
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
---
CMakeLists.txt | 64 +++++++++++++++++++++++++++++++---------------------------
package.xml | 2 +-
2 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aaf586d..ccb54f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,33 +40,35 @@ target_link_libraries(median ${catkin_LIBRARIES} ${Boost_LIBRARIES})
add_library(transfer_function src/transfer_function.cpp)
target_link_libraries(transfer_function ${catkin_LIBRARIES} ${Boost_LIBRARIES})
-# 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})
-add_rostest(test/test_median.launch)
-
-# Test transfer function filter
-add_executable(transfer_function_test EXCLUDE_FROM_ALL test/test_transfer_function.cpp)
-target_link_libraries(transfer_function_test transfer_function ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES})
-add_rostest(test/test_transfer_function.launch)
-
-# Test mean filter
-add_executable(mean_test EXCLUDE_FROM_ALL test/test_mean.cpp)
-target_link_libraries(mean_test mean ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES})
-add_rostest(test/test_mean.launch)
-
-# Test params filter
-add_executable(params_test EXCLUDE_FROM_ALL test/test_params.cpp)
-target_link_libraries(params_test params ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES})
-add_rostest(test/test_params.launch)
-
-# Test plugin loading into filter chain
-add_executable(chain_test EXCLUDE_FROM_ALL test/test_chain.cpp)
-target_link_libraries(chain_test increment ${Boost_libraries} ${catkin_LIBRARIES} ${GTEST_LIBRARIES}) # Needed for OSX
-add_rostest(test/test_chain.launch)
-
-# Test realtime safe buffer class
-catkin_add_gtest(realtime_buffer_test EXCLUDE_FROM_ALL test/test_realtime_circular_buffer.cpp)
+if(CATKIN_ENABLE_TESTING)
+ # 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})
+ add_rostest(test/test_median.launch)
+
+ # Test transfer function filter
+ add_executable(transfer_function_test EXCLUDE_FROM_ALL test/test_transfer_function.cpp)
+ target_link_libraries(transfer_function_test transfer_function ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES})
+ add_rostest(test/test_transfer_function.launch)
+
+ # Test mean filter
+ add_executable(mean_test EXCLUDE_FROM_ALL test/test_mean.cpp)
+ target_link_libraries(mean_test mean ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES})
+ add_rostest(test/test_mean.launch)
+
+ # Test params filter
+ add_executable(params_test EXCLUDE_FROM_ALL test/test_params.cpp)
+ target_link_libraries(params_test params ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${GTEST_LIBRARIES})
+ add_rostest(test/test_params.launch)
+
+ # Test plugin loading into filter chain
+ add_executable(chain_test EXCLUDE_FROM_ALL test/test_chain.cpp)
+ target_link_libraries(chain_test increment ${Boost_libraries} ${catkin_LIBRARIES} ${GTEST_LIBRARIES}) # Needed for OSX
+ add_rostest(test/test_chain.launch)
+
+ # Test realtime safe buffer class
+ catkin_add_gtest(realtime_buffer_test EXCLUDE_FROM_ALL test/test_realtime_circular_buffer.cpp)
+endif()
##############################################################################
# Install
@@ -88,6 +90,8 @@ install(FILES default_plugins.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
-if(TARGET tests)
-add_dependencies(tests median_test transfer_function_test mean_test params_test chain_test)
-endif()
\ No newline at end of file
+if(CATKIN_ENABLE_TESTING)
+ if(TARGET tests)
+ add_dependencies(tests median_test transfer_function_test mean_test params_test chain_test)
+ endif()
+endif()
diff --git a/package.xml b/package.xml
index c5bc897..dd66070 100644
--- a/package.xml
+++ b/package.xml
@@ -11,7 +11,7 @@
<license>BSD</license>
<url>http://ros.org/wiki/filters</url>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>roslib</build_depend>
<build_depend>rosconsole</build_depend>
--
1.8.1.2

View File

@ -0,0 +1,14 @@
DESCRIPTION = "This library provides a standardized interface for processing data as a sequence of filters."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "roslib rosconsole roscpp pluginlib rostest"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "0dd26504be16afa7816e9a5aa11715f1"
SRC_URI[sha256sum] = "fb71f1fbeaf89726877fce66dce1db8957c5cc6dffa1973d6a104a10233f8237"
SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch"
inherit catkin

View File

@ -0,0 +1,8 @@
DESCRIPTION = "tf2_tools"
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "tf2-msgs tf2 tf2-ros"
require geometry-experimental.inc

View File

@ -2,8 +2,6 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilena
SRC_URI[md5sum] = "32fd3bf4e85fdbf40a391daf32a8a91b"
SRC_URI[sha256sum] = "8b0341d39391abfec2b3f72dad2ec0ce8c37bd4443822322a64eacb36f0ce7b6"
SRC_URI += "file://0001-rostest-is-optional.patch;striplevel=2"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
inherit catkin

View File

@ -6,3 +6,5 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=18;endline=18;md5=d566ef916e9de
DEPENDS = "angles geometry-msgs message-filters sensor-msgs tf2-ros"
require geometry.inc
SRC_URI += "file://0001-rostest-is-optional.patch;striplevel=2"

View File

@ -0,0 +1,8 @@
DESCRIPTION = "camera_calibration_parsers contains routines for reading and writing camera calibration parameters."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "boost rosconsole sensor-msgs yaml-cpp"
require image-common.inc

View File

@ -0,0 +1,50 @@
From d5a4a37e0c5eee51f183057b156a4a3ac017070c Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sat, 12 Oct 2013 07:48:25 +0200
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
---
camera_info_manager/CMakeLists.txt | 16 +++++++++-------
camera_info_manager/package.xml | 2 +-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/camera_info_manager/CMakeLists.txt b/camera_info_manager/CMakeLists.txt
index 64009ec..f220861 100644
--- a/camera_info_manager/CMakeLists.txt
+++ b/camera_info_manager/CMakeLists.txt
@@ -33,10 +33,12 @@ install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
)
-# Unit test uses gtest, but needs rostest to create a ROS environment.
-# Hence, it must be created as a normal executable, not using
-# catkin_add_gtest() which runs an additional test without rostest.
-add_executable(unit_test tests/unit_test.cpp)
-target_link_libraries(unit_test ${PROJECT_NAME} ${GTEST_LIBRARIES})
-
-add_rostest(tests/unit_test.test)
+if(CATKIN_ENABLE_TESTING)
+ # Unit test uses gtest, but needs rostest to create a ROS environment.
+ # Hence, it must be created as a normal executable, not using
+ # catkin_add_gtest() which runs an additional test without rostest.
+ add_executable(unit_test tests/unit_test.cpp)
+ target_link_libraries(unit_test ${PROJECT_NAME} ${GTEST_LIBRARIES})
+
+ add_rostest(tests/unit_test.test)
+endif()
diff --git a/camera_info_manager/package.xml b/camera_info_manager/package.xml
index 4343e02..9aadd6b 100644
--- a/camera_info_manager/package.xml
+++ b/camera_info_manager/package.xml
@@ -18,7 +18,7 @@
<url type="bugtracker">https://github.com/ros-perception/image_common/issues</url>
<url type="repository">https://github.com/ros-perception/image_common</url>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>boost</build_depend>
<build_depend>camera_calibration_parsers</build_depend>
--
1.8.1.2

View File

@ -0,0 +1,10 @@
DESCRIPTION = "This package provides a C++ interface for camera calibration information."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "boost camera-calibration-parsers image-transport roscpp roslib rostest sensor-msgs"
require image-common.inc
SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;striplevel=2"

View File

@ -0,0 +1,9 @@
DESCRIPTION = "polled_camera contains a service and C++ helper classes for implementing a polled \
camera driver node and requesting images from it."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "message-generation image-transport rosconsole roscpp sensor-msgs std-msgs"
require image-common.inc

View File

@ -0,0 +1,61 @@
From 7d0a39237d5b6570aa4c931670420b44975a2447 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sat, 12 Oct 2013 13:43:17 +0200
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
---
camera_calibration/CMakeLists.txt | 21 +++++++++++----------
camera_calibration/package.xml | 2 +-
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/camera_calibration/CMakeLists.txt b/camera_calibration/CMakeLists.txt
index 129294f..69f1eeb 100644
--- a/camera_calibration/CMakeLists.txt
+++ b/camera_calibration/CMakeLists.txt
@@ -6,19 +6,20 @@ catkin_package()
catkin_python_setup()
-# Unit test of calibrator.py
-catkin_add_nosetests(test/directed.py)
+if(CATKIN_ENABLE_TESTING)
+ # Unit test of calibrator.py
+ catkin_add_nosetests(test/directed.py)
-# Unit test of the approximate synchronizer
-catkin_add_nosetests(test/testapproxsync.py)
+ # Unit test of the approximate synchronizer
+ catkin_add_nosetests(test/testapproxsync.py)
-# Tests simple calibration dataset
-catkin_download_test_data(camera_calibration.tar.gz http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz MD5 6da43ea314640a4c15dd7a90cbc3aee0)
-
-# Tests multiple checkerboards
-catkin_download_test_data(multi_board_calibration.tar.gz http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz MD5 ddc0f69582d140e33f9d3bfb681956bb)
-catkin_add_nosetests(test/multiple_boards.py)
+ # Tests simple calibration dataset
+ catkin_download_test_data(camera_calibration.tar.gz http://download.ros.org/data/camera_calibration/camera_calibration.tar.gz MD5 6da43ea314640a4c15dd7a90cbc3aee0)
+ # Tests multiple checkerboards
+ catkin_download_test_data(multi_board_calibration.tar.gz http://download.ros.org/data/camera_calibration/multi_board_calibration.tar.gz MD5 ddc0f69582d140e33f9d3bfb681956bb)
+ catkin_add_nosetests(test/multiple_boards.py)
+endif()
install(PROGRAMS nodes/camera_calibrate_from_disk.py
nodes/cameracalibrator.py
diff --git a/camera_calibration/package.xml b/camera_calibration/package.xml
index 620f958..662e938 100644
--- a/camera_calibration/package.xml
+++ b/camera_calibration/package.xml
@@ -9,7 +9,7 @@
<author>Patrick Mihelich</author>
<maintainer email="vincent.rabaud@gmail.com">Vincent Rabaud</maintainer>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<test_depend>rostest</test_depend>
--
1.8.1.2

View File

@ -0,0 +1,9 @@
DESCRIPTION = "camera_calibration allows easy calibration of monocular or stereo \
cameras using a checkerboard calibration target."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=22;endline=22;md5=d566ef916e9dedc494f5f793a6690ba5"
require image-pipeline.inc
SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;striplevel=2"

View File

@ -0,0 +1,9 @@
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "655ceb0d966d7105679d8c96304b2537"
SRC_URI[sha256sum] = "76bda6a0179de44a65f51a14d1967b81d45fe4e71c167cde25bd273bc63d22e0"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
inherit catkin
ROS_SPN = "image_pipeline"

View File

@ -0,0 +1,42 @@
From caee053fb6a82bf1552a7ca226f80014d830a089 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sat, 12 Oct 2013 13:55:06 +0200
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
---
image_proc/CMakeLists.txt | 8 +++++---
image_proc/package.xml | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/image_proc/CMakeLists.txt b/image_proc/CMakeLists.txt
index 25f9499..3653279 100644
--- a/image_proc/CMakeLists.txt
+++ b/image_proc/CMakeLists.txt
@@ -54,6 +54,8 @@ install(DIRECTORY launch
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/
)
-# Tests
-catkin_add_gtest(image_proc_rostest test/rostest.cpp)
-target_link_libraries(image_proc_rostest ${catkin_LIBRARIES} ${Boost_LIBRARIES})
+if(CATKIN_ENABLE_TESTING)
+ # Tests
+ catkin_add_gtest(image_proc_rostest test/rostest.cpp)
+ target_link_libraries(image_proc_rostest ${catkin_LIBRARIES} ${Boost_LIBRARIES})
+endif()
diff --git a/image_proc/package.xml b/image_proc/package.xml
index ebe5882..fd7dd92 100644
--- a/image_proc/package.xml
+++ b/image_proc/package.xml
@@ -13,7 +13,7 @@
<nodelet plugin="${prefix}/nodelet_plugins.xml" />
</export>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<test_depend>rostest</test_depend>
--
1.8.1.2

View File

@ -0,0 +1,10 @@
DESCRIPTION = "Single image rectification and color processing."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "boost camera-calibration-parsers cv-bridge dynamic-reconfigure image-geometry image-transport nodelet opencv roscpp sensor-msgs"
require image-pipeline.inc
SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;striplevel=2"

View File

@ -0,0 +1,9 @@
DESCRIPTION = "Contains a node that rotates an image stream in a way that minimizes \
the angle between a vector in some arbitrary frame and a vector in the camera frame."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=26;endline=26;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "cv-bridge dynamic-reconfigure image-transport opencv roscpp tf"
require image-pipeline.inc

View File

@ -0,0 +1,8 @@
DESCRIPTION = "A simple viewer for ROS image topics."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "camera-calibration-parsers cv-bridge image-transport message-filters nodelet opencv rosconsole roscpp sensor-msgs std-srvs stereo-msgs"
require image-pipeline.inc

View File

@ -0,0 +1,8 @@
DESCRIPTION = "Stereo and single image rectification and disparity processing."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "dynamic-reconfigure image-geometry image-proc image-transport message-filters nodelet opencv sensor-msgs stereo-msgs"
require image-pipeline.inc

View File

@ -0,0 +1,10 @@
DESCRIPTION = "Mesh Conversion Utility used to generate '.iv' files from '.stl' files."
SECTION = "devel"
LICENSE = "GPL"
LIC_FILES_CHKSUM = "file://package.xml;beginline=18;endline=18;md5=162b49cfbae9eadf37c9b89b2d2ac6be"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "eb0600372f526407d010eca4384de309"
SRC_URI[sha256sum] = "78c1ad40708a359c4d4648fbcba538379ad07fc49d7aa7ca676591e2d5c66344"
inherit catkin

View File

@ -0,0 +1,43 @@
From 4c1945fb38a39b3a139d043dc21cb745f313bcc1 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sun, 13 Oct 2013 17:41:58 +0200
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
---
CMakeLists.txt | 6 ++++--
package.xml | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cee35b..a628238 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,8 +20,10 @@ include_directories(include ${catkin_INCLUDE_DIRS})
add_library(laser_geometry src/laser_geometry.cpp)
target_link_libraries(laser_geometry ${Boost_LIBRARIES} ${tf_LIBRARIES})
-catkin_add_gtest(projection_test test/projection_test.cpp)
-target_link_libraries(projection_test laser_geometry)
+if(CATKIN_ENABLE_TESTING)
+ catkin_add_gtest(projection_test test/projection_test.cpp)
+ target_link_libraries(projection_test laser_geometry)
+endif()
install(TARGETS laser_geometry
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
diff --git a/package.xml b/package.xml
index 83e02e2..b000bde 100644
--- a/package.xml
+++ b/package.xml
@@ -15,7 +15,7 @@
<url>http://ros.org/wiki/laser_geometry</url>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>sensor_msgs</build_depend>
<build_depend>roscpp</build_depend>
--
1.8.1.2

View File

@ -0,0 +1,18 @@
DESCRIPTION = "This package contains a class for converting from a 2D laser scan as defined by \
sensor_msgs/LaserScan into a point cloud as defined by sensor_msgs/PointCloud \
or sensor_msgs/PointCloud2."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "angles boost libeigen sensor-msgs roscpp tf"
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "dce0a6f2a6a7eeee3913bb01ff8081e1"
SRC_URI[sha256sum] = "8df2f328bc8dfb7c54d89ffbe832c0f2756864d6baddb39d5ea229be9f52b14d"
SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch"
S = "${WORKDIR}/${ROS_SP}"
inherit catkin

View File

@ -0,0 +1,14 @@
DESCRIPTION = "This package defines messages commonly used in mapping packages."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=a3ae2ba3f0f44e61270955e8cd98afcf"
DEPENDS = "message-generation std-msgs sensor-msgs nav-msgs"
SRC_URI = "https://github.com/ethz-asl/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "e5c02300154e594800f4093f441c1740"
SRC_URI[sha256sum] = "d137fb17883a67c2bd6cc552c288d1b32b2300c532d0120473d0e020d109535d"
S = "${WORKDIR}/${ROS_SP}"
inherit catkin

View File

@ -0,0 +1,14 @@
DESCRIPTION = "This package provides messages and serializations / conversion for the OctoMap library."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=5ee5b8b046ae48ad94a2037ca953a67b"
DEPENDS = "message-generation geometry-msgs std-msgs"
SRC_URI = "https://github.com/OctoMap/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "6ffa1eebf7e41108b18522a2bc90ed77"
SRC_URI[sha256sum] = "86e1bfa6d4be8895ecf90fefb03b012978c54d1ee3bf20fe59925508507a899a"
S = "${WORKDIR}/${ROS_SP}"
inherit catkin

View File

@ -0,0 +1,12 @@
DESCRIPTION = "ROS-ified version of gmapping SLAM."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=6;endline=6;md5=d566ef916e9dedc494f5f793a6690ba5"
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "30ff92a30cd886165ad358888a1ff32a"
SRC_URI[sha256sum] = "7dca7aa3ce188d2e1d5f6817008e24ee1c26818c040d55a19939737513debcf1"
S = "${WORKDIR}/${ROS_SP}"
inherit catkin

View File

@ -36,6 +36,7 @@ RDEPENDS_${PN} = "\
tf2-ros \
tf2 \
tf \
tf2-tools \
image-transport \
nodelet-topic-tools \
nodelet \
@ -46,4 +47,57 @@ RDEPENDS_${PN} = "\
compressed-image-transport \
compressed-depth-image-transport \
theora-image-transport \
cmake-modules \
rosconsole-bridge \
urdfdom-headers \
urdfdom \
control-msgs \
realtime-tools \
control-toolbox \
controller-interface \
controller-manager-msgs \
controller-manager-tests \
controller-manager \
hardware-interface \
joint-limits-interface \
transmission-interface \
collada-parser \
resource-retriever \
urdf-parser-plugin \
urdf \
collada-dom \
effort-controllers \
force-torque-sensor-controller \
forward-command-controller \
imu-sensor-controller \
joint-state-controller \
position-controllers \
velocity-controllers \
openslam-gmapping \
gmapping \
image-geometry \
camera-calibration-parsers \
camera-info-manager \
polled-camera \
xacro \
filters \
smach \
smach-msgs \
smach-ros \
eigen-stl-containers \
ivcon \
convex-decomposition \
camera-calibration \
image-proc \
image-rotate \
image-view \
stereo-image-proc \
random-numbers \
shape-tools \
octomap-msgs \
pcl-msgs \
laser-geometry \
map-msgs \
"
# joint-state-publisher still has some issues

View File

@ -0,0 +1,14 @@
DESCRIPTION = "Package containing PCL (Point Cloud Library)-related ROS messages."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=5ee5b8b046ae48ad94a2037ca953a67b"
DEPENDS = "sensor-msgs"
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "6fe6f598d54d1b4ccb3ceb4868311519"
SRC_URI[sha256sum] = "b3b6b6568bbdd7a7f1d8f84f44227b34741622ee0dbc6b46bd749ae31ac3fe4d"
S = "${WORKDIR}/${ROS_SP}"
inherit catkin

View File

@ -7,8 +7,8 @@ LICENSE = "BSD & BSL-1.0"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=10;md5=bbbb6ab628b1f3daee74dd9c62bee312"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "0326d9e5b53c21cf6491cfc29bedaac6"
SRC_URI[sha256sum] = "78cf6ac7149ea9257ef85f2038fd29f069be76f7db8b1e068ab162739e3b02ac"
SRC_URI[md5sum] = "0d7ff6323e6d2122a624463aac94d5d5"
SRC_URI[sha256sum] = "eea71175bce307c495717ff51b793a189b5d19d7be8c564bf2ba6989dbc2c619"
DEPENDS = "boost class-loader rosconsole roslib libtinyxml"

View File

@ -0,0 +1,14 @@
DESCRIPTION = "This library contains wrappers for generating floating point values, integers, quaternions using boost libraries."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "boost"
SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "762a686cce0624fb86dab0cdff392b3a"
SRC_URI[sha256sum] = "195cd67c87eab51ffbe73ff53e7c899e0c8a1f7064dfae3b325d6c23ff4b4003"
S = "${WORKDIR}/${ROS_SP}"
inherit catkin

View File

@ -0,0 +1,139 @@
From eec215e06c1ceb0d3cb43a0863441d872056d239 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Sun, 15 Sep 2013 14:35:12 +0200
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
---
collada_urdf/CMakeLists.txt | 8 +++++---
collada_urdf/package.xml | 2 +-
kdl_parser/CMakeLists.txt | 6 ++++--
kdl_parser/package.xml | 2 +-
resource_retriever/CMakeLists.txt | 4 +++-
resource_retriever/package.xml | 2 +-
urdf/CMakeLists.txt | 6 ++++--
urdf/package.xml | 2 +-
8 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt
index 9d0e228..05217be 100644
--- a/collada_urdf/CMakeLists.txt
+++ b/collada_urdf/CMakeLists.txt
@@ -65,9 +65,11 @@ target_link_libraries(collada_to_urdf ${ASSIMP_LIBRARIES} ${catkin_LIBRARIES} ${
set_target_properties(collada_to_urdf PROPERTIES COMPILER_FLAGS "${ASSIMP_CXX_FLAGS} ${ASSIMP_CFLAGS_OTHER}")
set_target_properties(collada_to_urdf PROPERTIES LINK_FLAGS "${ASSIMP_LINK_FLAGS}")
-catkin_add_gtest(test_collada_writer test/test_collada_urdf.cpp)
-target_link_libraries(test_collada_writer ${PROJECT_NAME} ${catkin_LIBRARIES} ${COLLADA_DOM_LIBRARIES}
- ${Boost_LIBRARIES})
+if(CATKIN_ENABLE_TESTING)
+ catkin_add_gtest(test_collada_writer test/test_collada_urdf.cpp)
+ target_link_libraries(test_collada_writer ${PROJECT_NAME} ${catkin_LIBRARIES} ${COLLADA_DOM_LIBRARIES}
+ ${Boost_LIBRARIES})
+endif()
install(TARGETS ${PROJECT_NAME} urdf_to_collada collada_to_urdf
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
diff --git a/collada_urdf/package.xml b/collada_urdf/package.xml
index a846861..8cde4fe 100644
--- a/collada_urdf/package.xml
+++ b/collada_urdf/package.xml
@@ -16,7 +16,7 @@
<url type="website">http://ros.org/wiki/collada_urdf</url>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>angles</build_depend>
<build_depend>assimp</build_depend>
diff --git a/kdl_parser/CMakeLists.txt b/kdl_parser/CMakeLists.txt
index 7522ac3..3b8ff1d 100644
--- a/kdl_parser/CMakeLists.txt
+++ b/kdl_parser/CMakeLists.txt
@@ -31,8 +31,10 @@ target_link_libraries(${PROJECT_NAME}
add_executable(check_kdl_parser src/check_kdl_parser.cpp )
target_link_libraries(check_kdl_parser ${PROJECT_NAME})
-catkin_add_gtest(test_kdl_parser test/test_kdl_parser.cpp )
-target_link_libraries(test_kdl_parser ${PROJECT_NAME})
+if(CATKIN_ENABLE_TESTING)
+ catkin_add_gtest(test_kdl_parser test/test_kdl_parser.cpp )
+ target_link_libraries(test_kdl_parser ${PROJECT_NAME})
+endif()
# How does CATKIN do this?
#rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_kdl_parser.launch)
diff --git a/kdl_parser/package.xml b/kdl_parser/package.xml
index a82798a..e977f03 100644
--- a/kdl_parser/package.xml
+++ b/kdl_parser/package.xml
@@ -17,7 +17,7 @@
<url type="repository">https://github.com/ros/robot_model</url>
<url type="bugtracker">https://github.com/ros/robot_model/issues</url>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>orocos_kdl</build_depend>
<build_depend>rosconsole</build_depend>
diff --git a/resource_retriever/CMakeLists.txt b/resource_retriever/CMakeLists.txt
index 6e67160..f34b0da 100644
--- a/resource_retriever/CMakeLists.txt
+++ b/resource_retriever/CMakeLists.txt
@@ -26,7 +26,9 @@ include_directories(${CURL_INCLUDE_DIRS})
add_library(${PROJECT_NAME} src/retriever.cpp)
target_link_libraries(${PROJECT_NAME} ${CURL_LIBRARIES} ${catkin_LIBRARIES})
-add_subdirectory(test EXCLUDE_FROM_ALL)
+if(CATKIN_ENABLE_TESTING)
+ add_subdirectory(test EXCLUDE_FROM_ALL)
+endif()
install(TARGETS ${PROJECT_NAME}
DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
diff --git a/resource_retriever/package.xml b/resource_retriever/package.xml
index 562dff4..6e98408 100644
--- a/resource_retriever/package.xml
+++ b/resource_retriever/package.xml
@@ -19,7 +19,7 @@
<url type="repository">https://github.com/ros/robot_model</url>
<url type="bugtracker">https://github.com/ros/robot_model/issues</url>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>curl</build_depend>
<build_depend>rosconsole</build_depend>
diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
index 5fde363..7b07226 100644
--- a/urdf/CMakeLists.txt
+++ b/urdf/CMakeLists.txt
@@ -33,8 +33,10 @@ if(APPLE)
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
endif(APPLE)
-catkin_add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp)
-target_link_libraries(test_parser ${PROJECT_NAME})
+if(CATKIN_ENABLE_TESTING)
+ catkin_add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp)
+ target_link_libraries(test_parser ${PROJECT_NAME})
+endif()
# no idea how CATKIN does this
# rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_robot_model_parser.launch)
diff --git a/urdf/package.xml b/urdf/package.xml
index b623dfd..daf04a6 100644
--- a/urdf/package.xml
+++ b/urdf/package.xml
@@ -17,7 +17,7 @@
<url type="repository">https://github.com/ros/robot_model</url>
<url type="bugtracker">https://github.com/ros/robot_model/issues</url>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>rosconsole_bridge</build_depend>
<build_depend>roscpp</build_depend>
--
1.8.4

View File

@ -1,25 +0,0 @@
From dcc52b56eaade728f92356dd96f7d4cd2c95057e Mon Sep 17 00:00:00 2001
From: vmayoral <v.mayoralv@gmail.com>
Date: Fri, 9 Aug 2013 17:57:43 +0200
Subject: [PATCH] resource_retriever test/CMakeLists.txt fix
---
resource_retriever/test/CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/resource_retriever/test/CMakeLists.txt b/resource_retriever/test/CMakeLists.txt
index f133bf6..5e0ce18 100644
--- a/resource_retriever/test/CMakeLists.txt
+++ b/resource_retriever/test/CMakeLists.txt
@@ -1,4 +1,6 @@
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR})
-catkin_add_gtest(${PROJECT_NAME}_utest test.cpp)
-target_link_libraries(${PROJECT_NAME}_utest ${PROJECT_NAME})
+if(CATKIN_ENABLE_TESTING)
+ catkin_add_gtest(${PROJECT_NAME}_utest test.cpp)
+ target_link_libraries(${PROJECT_NAME}_utest ${PROJECT_NAME})
+endif()
--
1.7.9.5

View File

@ -6,6 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=16;endline=16;md5=d566ef916e9de
DEPENDS = "curl rosconsole roslib"
require robot-model.inc
SRC_URI += "file://0001-resource_retriever-test-CMakeLists.txt-fix.patch;striplevel=2"

View File

@ -2,6 +2,8 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilena
SRC_URI[md5sum] = "8408e5b990d157d1d30e56cc0a1ec28c"
SRC_URI[sha256sum] = "72374d3c43a2715a743365be186fddd23f016889430b5da1209f5bcaba08d141"
SRC_URI += "file://eec215e06c1ceb0d3cb43a0863441d872056d239.patch;patchdir=.."
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
inherit catkin

View File

@ -1,29 +0,0 @@
From 5a06a8525da6c0721f9a356ac631bc527b591f12 Mon Sep 17 00:00:00 2001
From: vmayoral <v.mayoralv@gmail.com>
Date: Fri, 9 Aug 2013 17:46:44 +0200
Subject: [PATCH] urdf CMakeLists fix
---
urdf/CMakeLists.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
index 0afcb03..3448c05 100644
--- a/urdf/CMakeLists.txt
+++ b/urdf/CMakeLists.txt
@@ -29,8 +29,10 @@ if(APPLE)
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
endif(APPLE)
-catkin_add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp)
-target_link_libraries(test_parser ${PROJECT_NAME})
+if(CATKIN_ENABLE_TESTING)
+ catkin_add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp)
+ target_link_libraries(test_parser ${PROJECT_NAME})
+endif()
# no idea how CATKIN does this
# rosbuild_add_rostest(${PROJECT_SOURCE_DIR}/test/test_robot_model_parser.launch)
--
1.7.9.5

View File

@ -6,5 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9de
DEPENDS = "rosconsole-bridge roscpp urdfdom-headers urdf-parser-plugin pluginlib urdfdom cmake-modules libtinyxml"
require robot-model.inc
SRC_URI += "file://0001-urdf-CMakeLists-fix.patch;striplevel=2"

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "098494e9d10b42ac37a32e595e9d68dc"
SRC_URI[sha256sum] = "6094ab6bd9df197d232825e82a714221fe816a1567495b920917d96f8e271d94"
SRC_URI[md5sum] = "823b571ac861a0c5bf41af103570c97c"
SRC_URI[sha256sum] = "e7c045b95a28e0f125a01bc79da0335d5cdf19d52c2c1814587c8c8a943e2e34"
SRC_URI += "file://0001-rostest-is-optional.patch;patchdir=../.."

View File

@ -3,7 +3,7 @@ SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "message-generation std-msgs"
DEPENDS = "message-generation std-msgs roscpp-serialization"
require ros-control.inc

View File

@ -1,33 +0,0 @@
From 2a9bdc617eea3334f8859adaa77df2af14b45a31 Mon Sep 17 00:00:00 2001
From: vmayoral <v.mayoralv@gmail.com>
Date: Thu, 8 Aug 2013 17:15:31 +0200
Subject: [PATCH] controller_manager_tests CMakeLists fix
---
controller_manager_tests/CMakeLists.txt | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/controller_manager_tests/CMakeLists.txt b/controller_manager_tests/CMakeLists.txt
index 1f553fa..95c73cc 100644
--- a/controller_manager_tests/CMakeLists.txt
+++ b/controller_manager_tests/CMakeLists.txt
@@ -52,10 +52,12 @@ else()
add_executable(dummy_app src/dummy_app.cpp)
target_link_libraries(dummy_app ${PROJECT_NAME} ${catkin_LIBRARIES})
- add_executable(cm_test test/cm_test.cpp)
- add_dependencies(tests cm_test)
- target_link_libraries(cm_test ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
- add_rostest(test/cm_test.test)
+ if(CATKIN_ENABLE_TESTING)
+ add_executable(cm_test test/cm_test.cpp)
+ add_dependencies(tests cm_test)
+ target_link_libraries(cm_test ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
+ add_rostest(test/cm_test.test)
+ endif()
# Install
install(DIRECTORY include/${PROJECT_NAME}/
--
1.7.9.5

View File

@ -6,7 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc
DEPENDS = "rostest control-toolbox controller-interface controller-manager"
require ros-control.inc
SRC_URI += "file://0001-controller_manager_tests-CMakeLists-fix.patch;striplevel=2;name=patch"
SRC_URI[patch.md5sum] = "f1c884eed3ab9acc9e22d41de6d1cf3d"
SRC_URI[patch.sha256sum] = "fef01dd0d9fcd23626416593868dd7afa769c4f68412e5073181d7c619c4492c"

View File

@ -1,64 +0,0 @@
From 612e2ac00fa82d160de82b09da67eb41b828ae95 Mon Sep 17 00:00:00 2001
From: vmayoral <v.mayoralv@gmail.com>
Date: Thu, 8 Aug 2013 16:02:07 +0200
Subject: [PATCH] CMakeLists CATKIN_ENABLE_TESTING patch
---
hardware_interface/CMakeLists.txt | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/hardware_interface/CMakeLists.txt b/hardware_interface/CMakeLists.txt
index 2681794..105421a 100644
--- a/hardware_interface/CMakeLists.txt
+++ b/hardware_interface/CMakeLists.txt
@@ -40,29 +40,31 @@ else()
INCLUDE_DIRS include
)
- catkin_add_gtest(hardware_resource_manager_test test/hardware_resource_manager_test.cpp)
- target_link_libraries(hardware_resource_manager_test ${catkin_LIBRARIES})
+ if(CATKIN_ENABLE_TESTING)
+ catkin_add_gtest(hardware_resource_manager_test test/hardware_resource_manager_test.cpp)
+ target_link_libraries(hardware_resource_manager_test ${catkin_LIBRARIES})
- catkin_add_gtest(actuator_state_interface_test test/actuator_state_interface_test.cpp)
- target_link_libraries(actuator_state_interface_test ${catkin_LIBRARIES})
+ catkin_add_gtest(actuator_state_interface_test test/actuator_state_interface_test.cpp)
+ target_link_libraries(actuator_state_interface_test ${catkin_LIBRARIES})
- catkin_add_gtest(actuator_command_interface_test test/actuator_command_interface_test.cpp)
- target_link_libraries(actuator_command_interface_test ${catkin_LIBRARIES})
+ catkin_add_gtest(actuator_command_interface_test test/actuator_command_interface_test.cpp)
+ target_link_libraries(actuator_command_interface_test ${catkin_LIBRARIES})
- catkin_add_gtest(joint_state_interface_test test/joint_state_interface_test.cpp)
- target_link_libraries(joint_state_interface_test ${catkin_LIBRARIES})
+ catkin_add_gtest(joint_state_interface_test test/joint_state_interface_test.cpp)
+ target_link_libraries(joint_state_interface_test ${catkin_LIBRARIES})
- catkin_add_gtest(joint_command_interface_test test/joint_command_interface_test.cpp)
- target_link_libraries(joint_command_interface_test ${catkin_LIBRARIES})
+ catkin_add_gtest(joint_command_interface_test test/joint_command_interface_test.cpp)
+ target_link_libraries(joint_command_interface_test ${catkin_LIBRARIES})
- catkin_add_gtest(force_torque_sensor_interface_test test/force_torque_sensor_interface_test.cpp)
- target_link_libraries(force_torque_sensor_interface_test ${catkin_LIBRARIES})
+ catkin_add_gtest(force_torque_sensor_interface_test test/force_torque_sensor_interface_test.cpp)
+ target_link_libraries(force_torque_sensor_interface_test ${catkin_LIBRARIES})
- catkin_add_gtest(imu_sensor_interface_test test/imu_sensor_interface_test.cpp)
- target_link_libraries(imu_sensor_interface_test ${catkin_LIBRARIES})
+ catkin_add_gtest(imu_sensor_interface_test test/imu_sensor_interface_test.cpp)
+ target_link_libraries(imu_sensor_interface_test ${catkin_LIBRARIES})
- catkin_add_gtest(robot_hw_test test/robot_hw_test.cpp)
- target_link_libraries(robot_hw_test ${catkin_LIBRARIES})
+ catkin_add_gtest(robot_hw_test test/robot_hw_test.cpp)
+ target_link_libraries(robot_hw_test ${catkin_LIBRARIES})
+ endif()
# Install
install(DIRECTORY include/${PROJECT_NAME}/
--
1.7.9.5

View File

@ -1,12 +0,0 @@
DESCRIPTION = "Hardware interface base class."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "roscpp"
require ros-control.inc
SRC_URI += "file://0001-CMakeLists-CATKIN_ENABLE_TESTING-patch.patch;striplevel=2;name=patch"
SRC_URI[patch.md5sum] = "9001c9c5336587b00b15510445d63100"
SRC_URI[patch.sha256sum] = "e3708e8f5d974d8d386ea7c361fd568c297bba36c1e5f92ff49565f2fd529131"

View File

@ -0,0 +1,8 @@
DESCRIPTION = "Hardware interface base class."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "roscpp"
require ros-control.inc

View File

@ -1,42 +0,0 @@
From 1dee61dabbf3b5de2170ca15ecea3ed93d57339d Mon Sep 17 00:00:00 2001
From: vmayoral <v.mayoralv@gmail.com>
Date: Sat, 17 Aug 2013 17:40:20 +0200
Subject: [PATCH] joint-limits-interface CMakeLists fix
---
joint_limits_interface/CMakeLists.txt | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/joint_limits_interface/CMakeLists.txt b/joint_limits_interface/CMakeLists.txt
index 6e18253..1561b22 100644
--- a/joint_limits_interface/CMakeLists.txt
+++ b/joint_limits_interface/CMakeLists.txt
@@ -43,16 +43,18 @@ else()
${urdfdom_LIBRARIES}
)
- catkin_add_gtest(joint_limits_interface_test test/joint_limits_interface_test.cpp)
- target_link_libraries(joint_limits_interface_test ${catkin_LIBRARIES})
+ if(CATKIN_ENABLE_TESTING)
+ catkin_add_gtest(joint_limits_interface_test test/joint_limits_interface_test.cpp)
+ target_link_libraries(joint_limits_interface_test ${catkin_LIBRARIES})
- catkin_add_gtest(joint_limits_urdf_test test/joint_limits_urdf_test.cpp)
- target_link_libraries(joint_limits_urdf_test ${catkin_LIBRARIES})
+ catkin_add_gtest(joint_limits_urdf_test test/joint_limits_urdf_test.cpp)
+ target_link_libraries(joint_limits_urdf_test ${catkin_LIBRARIES})
- catkin_add_gtest(joint_limits_rosparam_test test/joint_limits_urdf_test.cpp)
- target_link_libraries(joint_limits_rosparam_test ${catkin_LIBRARIES})
+ catkin_add_gtest(joint_limits_rosparam_test test/joint_limits_urdf_test.cpp)
+ target_link_libraries(joint_limits_rosparam_test ${catkin_LIBRARIES})
- add_rostest(test/joint_limits_rosparam.test)
+ add_rostest(test/joint_limits_rosparam.test)
+ endif()
# Install
install(DIRECTORY include/${PROJECT_NAME}/
--
1.7.9.5

View File

@ -6,7 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=6;endline=6;md5=d566ef916e9dedc
DEPENDS = "rostest roscpp hardware-interface urdfdom"
require ros-control.inc
SRC_URI += "file://0001-joint-limits-interface-CMakeLists-fix.patch;striplevel=2;name=patch"
SRC_URI[patch.md5sum] = "9001c9c5336587b00b15510445d63100"
SRC_URI[patch.sha256sum] = "e3708e8f5d974d8d386ea7c361fd568c297bba36c1e5f92ff49565f2fd529131"

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros-controls/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "f4d2b3a25817bfd988ac27bcf7ac8876"
SRC_URI[sha256sum] = "49d869d75ecaa76fecc27bbe043636bbb185d9bb65a1d454e68e77cec9ee1744"
SRC_URI[md5sum] = "59f1d09911db89c046e255a1597dfeff"
SRC_URI[sha256sum] = "7d913be4c4cba6a19c24e8327ed23cc3afe6d32f63650439aa96dfea14a291e5"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

View File

@ -1,33 +0,0 @@
From 0f0e92370addf4174e400fe729ad730c93d0299c Mon Sep 17 00:00:00 2001
From: Victor Mayoral Vilches <v.mayoralv@gmail.com>
Date: Thu, 15 Aug 2013 12:19:38 +0200
Subject: [PATCH] transmission interface comment gtests
---
transmission_interface/CMakeLists.txt | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/transmission_interface/CMakeLists.txt b/transmission_interface/CMakeLists.txt
index 89b5178..500e146 100644
--- a/transmission_interface/CMakeLists.txt
+++ b/transmission_interface/CMakeLists.txt
@@ -85,11 +85,11 @@ else()
## Testing ##
#############
- catkin_add_gtest(simple_transmission_test test/simple_transmission_test.cpp)
- catkin_add_gtest(differential_transmission_test test/differential_transmission_test.cpp)
- catkin_add_gtest(four_bar_linkage_transmission_test test/four_bar_linkage_transmission_test.cpp)
- catkin_add_gtest(transmission_interface_test test/transmission_interface_test.cpp)
- target_link_libraries(transmission_interface_test ${catkin_LIBRARIES} ${TinyXML_LIBRARIES})
+ #catkin_add_gtest(simple_transmission_test test/simple_transmission_test.cpp)
+ #catkin_add_gtest(differential_transmission_test test/differential_transmission_test.cpp)
+ #catkin_add_gtest(four_bar_linkage_transmission_test test/four_bar_linkage_transmission_test.cpp)
+ #catkin_add_gtest(transmission_interface_test test/transmission_interface_test.cpp)
+ #target_link_libraries(transmission_interface_test ${catkin_LIBRARIES} ${TinyXML_LIBRARIES})
endif()
--
1.7.9.5

View File

@ -6,8 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=68b329da9893e34
DEPENDS = "hardware-interface cmake-modules libtinyxml"
require ros-control.inc
SRC_URI += "file://0001-transmission-interface-comment-gtests.patch;striplevel=2;name=patch2"
SRC_URI[patch2.md5sum] = "60e27aa262486ba0f8161f8ea7e561e7"
SRC_URI[patch2.sha256sum] = "f99dac95eccc3ae209a3a35cfab0baa13843933fb8833845b4e067cf58828675"

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros-controls/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "30810eb0c812ad5369684e57c81af2f6"
SRC_URI[sha256sum] = "f05bfad85bb2141632b2f4a13f6bc55e4ec3677cdb37039574935faa1058d239"
SRC_URI[md5sum] = "d374e14a091fecc8a90fa37c2995ccb4"
SRC_URI[sha256sum] = "5c41d8384aef03760d24fd7c23c17706dbd00c505561c91077a2b0b707062012"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "48bce9a889933e0b0edb2073a7133486"
SRC_URI[sha256sum] = "0cac1b15f2741c14a5adba7ea133ac30a1da5d82143ec3c2074273c29a97a980"
SRC_URI[md5sum] = "ffe9605ce71998a19fbacf8e6de978af"
SRC_URI[sha256sum] = "05767cba08c36ece986878aae42141537d149d4fe66d4b67e2c3783c887423d3"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "d118f808d98a97c8f1fe215c8b8a891a"
SRC_URI[sha256sum] = "ec14b89bb0e9d142b715c04cf1619b43358f271ffd79ee8b3d0a46174aa0832d"
SRC_URI[md5sum] = "980e5d737e31f230aba1b9c0abb5caaf"
SRC_URI[sha256sum] = "e877f9511fdc35e4dfe5f0de53132b305bb0dffad9f1d7afc9632d5aea57f420"
ROS_PKG_SUBDIR ?= ""
S = "${WORKDIR}/${ROS_SP}/${ROS_PKG_SUBDIR}/${ROS_BPN}"

Some files were not shown because too many files have changed in this diff Show More