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

mavros: properly find Eigen (resolves #467)

This commit is contained in:
Lukas Bulwahn 2017-04-29 22:30:39 +02:00
parent f24390aff5
commit 47568013bd
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
recipes-ros/mavros/mavros/0001-always-find-Eigen-with-cmake_modules-mechanism.patch Normal file
View File

@ -0,0 +1,36 @@
From d7b00940cb69d659d77bb08b1cbbf5aad4ea4617 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Date: Sun, 7 May 2017 06:14:18 +0200
Subject: [PATCH] always find Eigen with cmake_modules mechanism
Upstream-Status: Pending
---
mavros/CMakeLists.txt | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/mavros/CMakeLists.txt b/mavros/CMakeLists.txt
index 3b3a0bd..bcc7924 100644
--- a/mavros/CMakeLists.txt
+++ b/mavros/CMakeLists.txt
@@ -26,14 +26,10 @@ find_package(catkin REQUIRED COMPONENTS
# find_package(Boost REQUIRED COMPONENTS system)
find_package(Boost REQUIRED COMPONENTS system)
-find_package(Eigen3)
-if(NOT EIGEN3_FOUND)
- # Fallback to cmake_modules
- find_package(cmake_modules REQUIRED)
- find_package(Eigen REQUIRED)
- set(EIGEN3_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS})
- set(EIGEN3_LIBRARIES ${EIGEN_LIBRARIES})
-endif()
+find_package(cmake_modules REQUIRED)
+find_package(Eigen REQUIRED)
+set(EIGEN3_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS})
+set(EIGEN3_LIBRARIES ${EIGEN_LIBRARIES})
include(EnableCXX11)
include(MavrosMavlink)
--
1.9.1

2
recipes-ros/mavros/mavros_0.17.5.bb
View File

@ -47,3 +47,5 @@ RDEPENDS_${PN}_append = "${MAVROS_RUN_AND_BUILD_DEPENDS}"
require mavros.inc
ROS_PKG_SUBDIR = "mavros"
SRC_URI += "file://0001-always-find-Eigen-with-cmake_modules-mechanism.patch;striplevel=2"