mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-09 05:49:23 +00:00
Code Issues Projects Releases Wiki Activity

gattlib: Update to latest tip

Browse Source 
Fix multilib builds

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2019-12-19 22:45:45 -08:00
parent fe2ee80eec
commit 262a36a076
2 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch
+53
View File
@@ -0,0 +1,53 @@
From 63dc2d0c9384d85482dc4cbb3c179b4b0bb18d4e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 19 Dec 2019 22:32:01 -0800
Subject: [PATCH] cmake: Use GNUInstallDirs
Helps install cmakefiles in right libdir
Upstream-Status: Submitted [https://github.com/labapart/gattlib/pull/139]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
CMakeLists.txt | 5 +++--
dbus/CMakeLists.txt | 18 ++++++++++--------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12d8d71..ded7239 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,8 @@ endif()
#
# List of file to install
#
-install(FILES include/gattlib.h DESTINATION include)
-install(FILES ${PROJECT_BINARY_DIR}/gattlib.pc DESTINATION lib/pkgconfig)
+include(GNUInstallDirs)
+install(FILES include/gattlib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(FILES ${PROJECT_BINARY_DIR}/gattlib.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
include(CPack)
diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt
index f5096ce..cef031f 100644
--- a/dbus/CMakeLists.txt
+++ b/dbus/CMakeLists.txt
@@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.0)
find_package(PkgConfig REQUIRED)
@@ -119,4 +119,6 @@ endif()
add_library(gattlib SHARED ${gattlib_SRCS})
target_link_libraries(gattlib ${gattlib_LIBS})
-install(TARGETS gattlib LIBRARY DESTINATION lib)
+include(GNUInstallDirs)
+
+install(TARGETS gattlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
--
2.24.1
meta-oe/recipes-connectivity/gattlib/gattlib_git.bb
+5 -3
View File
@@ -9,11 +9,13 @@ DEPENDS += "glib-2.0-native"
PV = "0.2+git${SRCPV}"
SRC_URI = "git://github.com/labapart/gattlib.git"
SRC_URI += "file://dbus-avoid-strange-chars-from-the-build-dir.patch"
SRC_URI = "git://github.com/labapart/gattlib.git \
file://dbus-avoid-strange-chars-from-the-build-dir.patch \
file://0001-cmake-Use-GNUInstallDirs.patch \
"
SRCBRANCH = "master"
SRCREV = "c6a33252221dff904cf277e085e2ce70aced8788"
SRCREV = "5c7ee43bd70ee09a7170ddd55b9fdbdef69e9080"
S = "${WORKDIR}/git"