gencpp: updating to 0.4.14

The gencpp recipe is updated to 0.4.14 to be in line with
4551e7c32d/hydro/release.yaml.
The previously applied patch has been included in 0.4.14 and is
removed from the recipe and this repository.
The PR variable is reset.
This commit is contained in:
Lukas Bulwahn 2013-08-26 10:31:05 +02:00
parent cb964c9040
commit 46d29e7c47
2 changed files with 2 additions and 34 deletions

View File

@ -1,28 +0,0 @@
From e5acaf690d6276d427f6b0ecaab67b52f55bbe8a Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dthomas@osrfoundation.org>
Date: Fri, 26 Jul 2013 13:33:58 -0700
Subject: [PATCH] resolve gencpp path in installspace at runtime
(ros/catkin#490)
---
cmake/gencpp-extras.cmake.em | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/gencpp-extras.cmake.em b/cmake/gencpp-extras.cmake.em
index 87f46fd..88ce935 100644
--- a/cmake/gencpp-extras.cmake.em
+++ b/cmake/gencpp-extras.cmake.em
@@ -4,8 +4,8 @@ set(GENCPP_BIN "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_cpp.py")
set(GENCPP_TEMPLATE_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
@[else]@
# bin and template dir variables in installspace
-set(GENCPP_BIN "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_cpp.py")
-set(GENCPP_TEMPLATE_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)")
+set(GENCPP_BIN "${gencpp_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_cpp.py")
+set(GENCPP_TEMPLATE_DIR "${gencpp_DIR}/..")
@[end if]@
# Generate .msg->.h for cpp
--
1.8.1.6

View File

@ -5,12 +5,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc
DEPENDS = "genmsg-native"
PR = "r2"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "801b40dcfab468f761dbdae33f848782"
SRC_URI[sha256sum] = "d1dcd6655c8c4d4325ab067c25284032d40e00aa3409a5a5cf069d310a60d485"
SRC_URI += "file://0001-resolve-gencpp-path-in-installspace-at-runtime.patch"
SRC_URI[md5sum] = "56f32da469434f1a2ca28fc8aa3d8eb5"
SRC_URI[sha256sum] = "029742b10f4fb981d8ceef8ae440f50e2ac8670eb9901b7c70e76d933d7f07c2"
inherit catkin