From 55b4e30b3ccaeb22e9e551b41b368ce663c5a163 Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Fri, 12 Jul 2013 07:08:03 +0200 Subject: [PATCH] genpy: updated to hydro release version To update to the hydro release version, the genpy patch required some minor adjustments. --- ...y-extras.cmake.em-use-find_program-for-GENxxx_PY_BIN.patch | 4 ++-- recipes-ros/genpy/{genpy_0.4.10.bb => genpy_0.4.13.bb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename recipes-ros/genpy/{genpy_0.4.10.bb => genpy_0.4.13.bb} (78%) diff --git a/recipes-ros/genpy/genpy/0001-genpy-extras.cmake.em-use-find_program-for-GENxxx_PY_BIN.patch b/recipes-ros/genpy/genpy/0001-genpy-extras.cmake.em-use-find_program-for-GENxxx_PY_BIN.patch index eb87087..99216a7 100644 --- a/recipes-ros/genpy/genpy/0001-genpy-extras.cmake.em-use-find_program-for-GENxxx_PY_BIN.patch +++ b/recipes-ros/genpy/genpy/0001-genpy-extras.cmake.em-use-find_program-for-GENxxx_PY_BIN.patch @@ -4,11 +4,11 @@ diff -Naur a/cmake/genpy-extras.cmake.em b/cmake/genpy-extras.cmake.em @@ -1,13 +1,15 @@ @[if DEVELSPACE]@ # bin dir variables in develspace - set(GENPY_BIN_DIR @(CMAKE_CURRENT_SOURCE_DIR)/scripts) + set(GENPY_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts") +set(CATKIN_FIND_ROOT_PATH_MODE NO_CMAKE_FIND_ROOT_PATH) @[else]@ # bin dir variables in installspace - set(GENPY_BIN_DIR @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)) + set(GENPY_BIN_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)") +set(CATKIN_FIND_ROOT_PATH_MODE "") @[end if]@ diff --git a/recipes-ros/genpy/genpy_0.4.10.bb b/recipes-ros/genpy/genpy_0.4.13.bb similarity index 78% rename from recipes-ros/genpy/genpy_0.4.10.bb rename to recipes-ros/genpy/genpy_0.4.13.bb index 2082ec8..0828b2d 100644 --- a/recipes-ros/genpy/genpy_0.4.10.bb +++ b/recipes-ros/genpy/genpy_0.4.13.bb @@ -11,7 +11,7 @@ PR = "r2" SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz \ file://0001-genpy-extras.cmake.em-use-find_program-for-GENxxx_PY_BIN.patch" -SRC_URI[md5sum] = "23915e68167ba6d58c65920bfabd2fad" -SRC_URI[sha256sum] = "6c77bde606c9637b0fa9e6f4ed85882e98547500a7472d2643bcc52b6c8a8b78" +SRC_URI[md5sum] = "201e3f1aa5e12ccc09159b1a3d9272f7" +SRC_URI[sha256sum] = "9dae768e9350c835ae8a40f19d230e3fe023bfc1e259a14be8b3ae7c4c632d3c" inherit catkin