genpy: updated to hydro release version

To update to the hydro release version, the genpy patch required
some minor adjustments.
This commit is contained in:
Lukas Bulwahn 2013-07-12 07:08:03 +02:00
parent cad74da7c3
commit 55b4e30b3c
2 changed files with 4 additions and 4 deletions

View File

@ -4,11 +4,11 @@ diff -Naur a/cmake/genpy-extras.cmake.em b/cmake/genpy-extras.cmake.em
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
@[if DEVELSPACE]@ @[if DEVELSPACE]@
# bin dir variables in 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) +set(CATKIN_FIND_ROOT_PATH_MODE NO_CMAKE_FIND_ROOT_PATH)
@[else]@ @[else]@
# bin dir variables in installspace # 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 "") +set(CATKIN_FIND_ROOT_PATH_MODE "")
@[end if]@ @[end if]@

View File

@ -11,7 +11,7 @@ PR = "r2"
SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz \ 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" file://0001-genpy-extras.cmake.em-use-find_program-for-GENxxx_PY_BIN.patch"
SRC_URI[md5sum] = "23915e68167ba6d58c65920bfabd2fad" SRC_URI[md5sum] = "201e3f1aa5e12ccc09159b1a3d9272f7"
SRC_URI[sha256sum] = "6c77bde606c9637b0fa9e6f4ed85882e98547500a7472d2643bcc52b6c8a8b78" SRC_URI[sha256sum] = "9dae768e9350c835ae8a40f19d230e3fe023bfc1e259a14be8b3ae7c4c632d3c"
inherit catkin inherit catkin