From 967a738e10dd5e99025b66e5289f89548473f8c6 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 18 Sep 2025 14:33:28 +0100 Subject: [PATCH] Use pkg-config to find libsolv Signed-off-by: Ross Burton --- CMakeLists.txt | 5 +---- libdnf/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a489ea731e..53f77c3257 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,11 +54,8 @@ if(APPLE) endif() -# build dependencies -find_package(LibSolv 0.7.21 REQUIRED COMPONENTS ext) - - # build dependencies via pkg-config +pkg_check_modules (LIBSOLV REQUIRED libsolv>=0.7.21 libsolvext) pkg_check_modules(CHECK REQUIRED check) pkg_check_modules(GLIB REQUIRED gio-unix-2.0>=2.46.0) include_directories(${GLIB_INCLUDE_DIRS}) diff --git a/libdnf/CMakeLists.txt b/libdnf/CMakeLists.txt index f37d236a22..e159807067 100644 --- a/libdnf/CMakeLists.txt +++ b/libdnf/CMakeLists.txt @@ -73,8 +73,7 @@ target_link_libraries(libdnf ${GLIB_GOBJECT_LIBRARIES} ${GLIB_GIO_LIBRARIES} ${GLIB_GIO_UNIX_LIBRARIES} - ${LIBSOLV_LIBRARY} - ${LIBSOLV_EXT_LIBRARY} + ${LIBSOLV_LIBRARIES} ${RPM_LIBRARIES} ${SCOLS_LIBRARIES} ${SQLite3_LIBRARIES}