mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 18:32:15 +02:00
a57d688e46
(From OE-Core rev: 35c163f6ebdc41eb6b65fca05706854b1aac20b5) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
From 2bcd0b9f6310bacdc554e077e85319a5e90e5ce0 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
Date: Fri, 30 Dec 2016 18:24:50 +0200
|
|
Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module
|
|
|
|
doesn't work properly).
|
|
|
|
Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312]
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
|
|
---
|
|
CMakeLists.txt | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 0b405cb..cd91f08 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -46,7 +46,8 @@ endif(APPLE)
|
|
PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED)
|
|
pkg_check_modules(SMARTCOLS REQUIRED smartcols)
|
|
FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
|
|
-find_package (LibSolv 0.6.30 REQUIRED COMPONENTS ext)
|
|
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
|
|
+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
|
|
if (ENABLE_RHSM_SUPPORT)
|
|
pkg_check_modules (RHSM REQUIRED librhsm>=0.0.3)
|
|
include_directories (${RHSM_INCLUDE_DIRS})
|