p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

camera-info-manager: initial commit

This commit is contained in:
Lukas Bulwahn 2013-10-12 08:19:51 +02:00
parent c7c47ba0ef
commit b81936999d
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
recipes-ros/image-common/camera-info-manager/0001-check-for-CATKIN_ENABLE_TESTING.patch Normal file
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

10
recipes-ros/image-common/camera-info-manager_1.11.0.bb Normal file
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"