CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

upm_git.bb: Add fix for installing the python files

Browse Source 
Use SWIG_SUPPORT_FILES to find the list of python files generated by
CMake Swig module and install those files. This should be applicable to
cmake version 3.12 or higher

Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Manjukumar Matha 2019-02-14 16:28:36 -08:00 committed by Khem Raj
parent 20e298af0e
commit 5d5c14ef49
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
meta-oe/recipes-extended/upm/upm/0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch Normal file
View File

@ -0,0 +1,38 @@
From 3707f467f9a26a7df3d41385023b43c3d08911d2 Mon Sep 17 00:00:00 2001
From: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
Date: Tue, 12 Feb 2019 17:46:52 -0800
Subject: [PATCH][v3] CMakeLists.txt: Use SWIG_SUPPORT_FILES to find the list
of generated files for cmake version 3.12 or higher
Use SWIG_SUPPORT_FILES to find the list of python files generated by
CMake Swig module and install those files. This should be applicable to
cmake version 3.12 or higher
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
---
src/CMakeLists.txt | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e19cda2..b565814 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -337,8 +337,14 @@ macro(_upm_swig_python)
OUTPUT_NAME _pyupm_${libname}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_PYTHON_BINARY_DIR})
+ if (CMAKE_VERSION VERSION_LESS "3.12")
+ set(support_files ${swig_extra_generated_files})
+ else()
+ get_property(support_files TARGET _${python_wrapper_name} PROPERTY SWIG_SUPPORT_FILES)
+ endif()
+
# Install .py's to python packages directory/upm
- install (FILES ${swig_extra_generated_files}
+ install (FILES ${support_files}
DESTINATION ${PYTHON_PACKAGES_PATH}/upm
COMPONENT ${CMAKE_PROJECT_NAME}-python${PYTHON_VERSION_MAJOR})
--
2.7.4

3
meta-oe/recipes-extended/upm/upm_git.bb
View File

@ -13,6 +13,7 @@ PV = "1.6.0-git${SRCPV}"
SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \
file://0001-Replace-strncpy-with-memcpy.patch \
file://0001-include-sys-types.h-for-uint-definition.patch \
file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \
"
S = "${WORKDIR}/git"
@ -20,7 +21,7 @@ S = "${WORKDIR}/git"
# Depends on mraa which only supports x86 and ARM for now
COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
inherit distutils3-base cmake
inherit distutils3-base cmake pkgconfig
# override this in local.conf to get needed bindings.
# BINDINGS_pn-upm="python"