p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmake-modules: updating to 0.3.2 

After updating to 0.3.2, the patch is obsolete, and hence removed.
This commit is contained in:
Lukas Bulwahn 2014-10-28 07:15:35 +01:00
parent af60756886
commit 6ef9654f7c
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
recipes-ros/cmake-modules/cmake-modules/0001-Fix-the-path-added-to-CMAKE_MODULE_PATH.patch
View File

@ -1,24 +0,0 @@
From 47c18f75d6a3950836d64b77d7e415ecca3755e9 Mon Sep 17 00:00:00 2001
From: vmayoral <v.mayoralv@gmail.com>
Date: Fri, 20 Sep 2013 13:22:53 +0200
Subject: [PATCH] Fix the path added to CMAKE_MODULE_PATH.
@CMAKE_INSTALL_PREFIX@/@CATKIN_PACKAGE_SHARE_DESTINATION@ have been
replaced with "${cmake_modules_DIR}/.." to make the module work.
Upstream-Status: Pending
---
cmake/cmake_modules-extras.cmake.installspace.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/cmake_modules-extras.cmake.installspace.in b/cmake/cmake_modules-extras.cmake.installspace.in
index a4cd265..0701f02 100644
--- a/cmake/cmake_modules-extras.cmake.installspace.in
+++ b/cmake/cmake_modules-extras.cmake.installspace.in
@@ -1,2 +1,2 @@
# Prepend the installed cmake modules to the cmake module path
-list(INSERT CMAKE_MODULE_PATH 0 @CMAKE_INSTALL_PREFIX@/@CATKIN_PACKAGE_SHARE_DESTINATION@/cmake/Modules)
+list(INSERT CMAKE_MODULE_PATH 0 ${cmake_modules_DIR}/../cmake/Modules)
--
1.7.9.5

8
recipes-ros/cmake-modules/cmake-modules_0.2.1.bb → recipes-ros/cmake-modules/cmake-modules_0.3.2.bb
View File

@ -5,12 +5,8 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5" LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "428f2fd70cac67a3a3ccfcc8220894b4" SRC_URI[md5sum] = "46c3190968bf5f2d4c05ba6424372e40"
SRC_URI[sha256sum] = "3e42c825a1aa956ef47dff0fff058320a8253e96c756a870a7c647902d30c875" SRC_URI[sha256sum] = "298a7f29e7bda94c2117f5cd8fcbe9cbf56f79c4328e036639bb5f417113165c"
SRC_URI += "file://0001-Fix-the-path-added-to-CMAKE_MODULE_PATH.patch;striplevel=1;name=patch"
SRC_URI[patch.md5sum] = "eba3a7eda081516f2113d6db70e881df"
SRC_URI[patch.sha256sum] = "164a8e9d8595856be6a1523fa9ecc0c329961bb89bde2045fefc21306aae6de4"
S = "${WORKDIR}/${ROS_SP}" S = "${WORKDIR}/${ROS_SP}"