image-common: updating to 1.11.1
The version 1.11.1 contains the local patch for CATKIN_ENABLE_TESTING, and hence the local patch can be removed.
This commit is contained in:
parent
c53ecdb57b
commit
8c59f76355
|
@ -1,50 +0,0 @@
|
||||||
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
|
|
||||||
|
|
|
@ -6,5 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9de
|
||||||
DEPENDS = "boost camera-calibration-parsers image-transport roscpp roslib rostest sensor-msgs"
|
DEPENDS = "boost camera-calibration-parsers image-transport roscpp roslib rostest sensor-msgs"
|
||||||
|
|
||||||
require image-common.inc
|
require image-common.inc
|
||||||
|
|
||||||
SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;striplevel=2"
|
|
|
@ -1,6 +1,6 @@
|
||||||
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
|
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
|
||||||
SRC_URI[md5sum] = "72dc5897c021987cca04756cbf3ddc27"
|
SRC_URI[md5sum] = "4339a2bc7a7fca8dad6b6c0d7796204d"
|
||||||
SRC_URI[sha256sum] = "022f3c81ade13e644cf7f3c96712a362dc668f2edf37c125f3b9411818eb294a"
|
SRC_URI[sha256sum] = "bcce381f5525fe4185b08c23cbf4f1ddf2bc86263cdb53a7938c6dbf596d8ecc"
|
||||||
|
|
||||||
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
|
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue