DRAFT Drop realsense-camera_1.8.0.bb (never used by ROS "indigo" components)
This commit is contained in:
parent
be42addec4
commit
544b49e31a
|
@ -1,33 +0,0 @@
|
|||
From fb74e5eec2368f20c4b43cf9224519b29aee35ad Mon Sep 17 00:00:00 2001
|
||||
From: Murilo Belluzzo <murilo.belluzzo@intel.com>
|
||||
Date: Wed, 5 Apr 2017 17:06:44 -0700
|
||||
Subject: [PATCH 3/3] librealsense: Fix link when the system library is used
|
||||
|
||||
Otherwise librealsense won't be listed as a dependency for the nodelet
|
||||
that will fail to load due to undefined symbols.
|
||||
|
||||
Upstream-Status: Accepted (expected in v1.8.1)
|
||||
[https://github.com/intel-ros/realsense/pull/226]
|
||||
|
||||
Signed-off-by: Murilo Belluzzo <murilo.belluzzo@intel.com>
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a1ec2f6..926992a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -106,6 +106,12 @@ add_library(${PROJECT_NAME}_nodelet src/base_nodelet.cpp src/r200_nodelet.cpp sr
|
||||
target_link_libraries(${PROJECT_NAME}_nodelet
|
||||
${catkin_LIBRARIES}
|
||||
)
|
||||
+if(USE_SYSTEM_LIBREALSENSE)
|
||||
+ target_link_libraries(${PROJECT_NAME}_nodelet
|
||||
+ ${realsense_LIBRARY}
|
||||
+ )
|
||||
+endif()
|
||||
+
|
||||
add_dependencies(${PROJECT_NAME}_nodelet ${PROJECT_NAME}_generate_messages_cpp ${PROJECT_NAME}_gencfg)
|
||||
add_dependencies(${PROJECT_NAME}_nodelet ${catkin_EXPORTED_TARGETS})
|
||||
|
||||
--
|
||||
2.12.2
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
DESCRIPTION = "ROS driver for RealSense camera"
|
||||
LICENSE = "BSD"
|
||||
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=4bcd5f0e140091c68f8c0bcfdd6181e0"
|
||||
|
||||
DEPENDS = "librealsense cv-bridge camera-info-manager pcl-ros roscpp"
|
||||
RDEPENDS_${PN} = "rgbd-launch"
|
||||
|
||||
SRC_URI = "https://github.com/intel-ros/realsense/archive/${PV}.tar.gz \
|
||||
file://0001-librealsense-Fix-link-when-the-system-library-is-use.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "d2b6b4ef563e82acca28597e542b5049"
|
||||
SRC_URI[sha256sum] = "18e2d3e847b3b1158c124b6167ea2751236a2749aca03532ca7d9f5b7b59e975"
|
||||
|
||||
S = "${WORKDIR}/realsense-${PV}/realsense_camera"
|
||||
|
||||
inherit catkin
|
||||
|
||||
EXTRA_OECMAKE = "-DUSE_SYSTEM_LIBREALSENSE:BOOL=ON"
|
Loading…
Reference in New Issue