aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorLukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>2015-10-23 08:01:16 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2015-10-26 21:37:37 +0100
commitaaf7140847f33b85dbe6382d4084e44e3247e34c (patch)
tree07d7ab7c0ed4360a49ca4bf41c23e37a448d03b7 /meta-oe
parent5b8bd1633263bf9a346453f50fde7d78690d1996 (diff)
downloadmeta-openembedded-contrib-aaf7140847f33b85dbe6382d4084e44e3247e34c.tar.gz
meta-openembedded-contrib-aaf7140847f33b85dbe6382d4084e44e3247e34c.tar.bz2
meta-openembedded-contrib-aaf7140847f33b85dbe6382d4084e44e3247e34c.zip
libeigen: patch to install the find cmake script
This commit is needed for the pcl-ros 1.3.0 recipe in the meta-ros layer, which detects the Eigen library with the provided cmake script. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/libeigen/libeigen/0001-CMakeLists.txt-install-FindEigen3.cmake-script.patch28
-rw-r--r--meta-oe/recipes-support/libeigen/libeigen_3.2.6.bb4
2 files changed, 31 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/libeigen/libeigen/0001-CMakeLists.txt-install-FindEigen3.cmake-script.patch b/meta-oe/recipes-support/libeigen/libeigen/0001-CMakeLists.txt-install-FindEigen3.cmake-script.patch
new file mode 100644
index 0000000000..761dadbc34
--- /dev/null
+++ b/meta-oe/recipes-support/libeigen/libeigen/0001-CMakeLists.txt-install-FindEigen3.cmake-script.patch
@@ -0,0 +1,28 @@
+From fd8bc66efac1059c1068f804746b01b90177c333 Mon Sep 17 00:00:00 2001
+From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+Date: Sun, 18 Oct 2015 16:52:25 +0200
+Subject: [PATCH] CMakeLists.txt: install FindEigen3.cmake script
+
+Upstream-Status: Pending
+
+Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 76a11b9..ec6c6ea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -342,6 +342,8 @@ if(EIGEN_BUILD_PKGCONFIG)
+ )
+ endif(EIGEN_BUILD_PKGCONFIG)
+
++install(FILES "${PROJECT_SOURCE_DIR}/cmake/FindEigen3.cmake" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/cmake/Modules")
++
+ add_subdirectory(Eigen)
+
+ add_subdirectory(doc EXCLUDE_FROM_ALL)
+--
+1.9.3
+
diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.2.6.bb b/meta-oe/recipes-support/libeigen/libeigen_3.2.6.bb
index 4d73597567..89a25a9a35 100644
--- a/meta-oe/recipes-support/libeigen/libeigen_3.2.6.bb
+++ b/meta-oe/recipes-support/libeigen/libeigen_3.2.6.bb
@@ -4,7 +4,8 @@ HOMEPAGE = "http://eigen.tuxfamily.org/"
LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad"
-SRC_URI = "http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2"
+SRC_URI = "http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 \
+ file://0001-CMakeLists.txt-install-FindEigen3.cmake-script.patch"
SRC_URI[md5sum] = "87274966745d2d3e7964fcc654d0a24b"
SRC_URI[sha256sum] = "8a3352f9a5361fe90e451a7305fb1896fc7f771dc16cc0edd8e6b157f52c343e"
@@ -15,6 +16,7 @@ inherit cmake
EXTRA_OECMAKE += "-Dpkg_config_libdir=${libdir}"
FILES_${PN} = "${includedir} ${libdir}"
+FILES_${PN}-dev = "${datadir}/cmake/Modules"
# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
RDEPENDS_${PN}-dev = ""