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

geometry: drop patch not needed after libeigen update

This commit is contained in:
Lukas Bulwahn 2017-11-02 09:53:40 +01:00
parent 12b4c597e6
commit c456672efc
2 changed files with 0 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
recipes-ros/geometry/files/0001-find-Eigen-with-cmake_modules-Find-script-partly-rev.patch
View File

@ -1,64 +0,0 @@
From fc3670a9a37c806458fba9ef6332a63ea8f31951 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Date: Mon, 14 Aug 2017 18:00:37 +0200
Subject: [PATCH] find Eigen with cmake_modules' Find script (partly reverts
707eb4119d)
Upstream-Status: Inappropriate [openembedded-specific adjustment]
---
eigen_conversions/CMakeLists.txt | 6 +++---
tf_conversions/CMakeLists.txt | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/eigen_conversions/CMakeLists.txt b/eigen_conversions/CMakeLists.txt
index 5277aea..f056048 100644
--- a/eigen_conversions/CMakeLists.txt
+++ b/eigen_conversions/CMakeLists.txt
@@ -3,15 +3,15 @@ project(eigen_conversions)
find_package(orocos_kdl REQUIRED)
find_package(catkin REQUIRED cmake_modules geometry_msgs std_msgs)
-find_package(Eigen3 REQUIRED)
+find_package(Eigen REQUIRED)
-include_directories(SYSTEM ${EIGEN3_INCLUDE_DIRS})
+include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS})
include_directories(include ${catkin_INCLUDE_DIRS} ${orocos_kdl_INCLUDE_DIRS})
link_directories(${catkin_LIBRARY_DIRS})
link_directories(${orocos_kdl_LIBRARY_DIRS})
catkin_package(
- INCLUDE_DIRS include ${EIGEN3_INCLUDE_DIRS}
+ INCLUDE_DIRS include ${EIGEN_INCLUDE_DIRS}
LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS geometry_msgs std_msgs
DEPENDS orocos_kdl
diff --git a/tf_conversions/CMakeLists.txt b/tf_conversions/CMakeLists.txt
index 543bbdb..5797b2f 100644
--- a/tf_conversions/CMakeLists.txt
+++ b/tf_conversions/CMakeLists.txt
@@ -3,18 +3,18 @@ project(tf_conversions)
find_package(orocos_kdl REQUIRED)
find_package(catkin REQUIRED cmake_modules geometry_msgs kdl_conversions tf)
-find_package(Eigen3 REQUIRED)
+find_package(Eigen REQUIRED)
catkin_python_setup()
catkin_package(
INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME}
- DEPENDS EIGEN3 orocos_kdl
+ DEPENDS EIGEN orocos_kdl
CATKIN_DEPENDS geometry_msgs kdl_conversions tf
)
-include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIRS} ${orocos_kdl_INCLUDE_DIRS})
+include_directories(include ${catkin_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${orocos_kdl_INCLUDE_DIRS})
# Needed due to no full filename in orocos_kdl pkg-config export
link_directories(${orocos_kdl_LIBRARY_DIRS})
--
1.9.1

2
recipes-ros/geometry/geometry.inc
View File

@ -2,8 +2,6 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilena
SRC_URI[md5sum] = "5d55aa4d8b5fea53e0fc72605843b4d0"
SRC_URI[sha256sum] = "8c8e20d28d352b3ccb227ca7da39a1dddc051cf8309f90a46d6b0c7b2e398d33"
SRC_URI += "file://0001-find-Eigen-with-cmake_modules-Find-script-partly-rev.patch;patchdir=.."
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
inherit catkin