mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 09:32:14 +02:00
49029c2248
(From OE-Core rev: 564ae957b81911bb69315f230a9757a303deec0a) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From bcea5c5063a2d5f07dbe6f40aee30370fc4ba656 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 1/2] 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 8875bbf..ca280f3 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -29,7 +29,8 @@ find_package (PkgConfig REQUIRED)
|
|
SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
|
|
PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED)
|
|
FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
|
|
-find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext)
|
|
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
|
|
+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
|
|
if (ENABLE_RHSM_SUPPORT)
|
|
pkg_check_modules (RHSM REQUIRED librhsm)
|
|
include_directories (${RHSM_INCLUDE_DIRS})
|
|
--
|
|
2.14.2
|
|
|