Use pkg-config to lacte gpgme

Bug-Debian: https://bugs.debian.org/1024577
Origin: vendor
Last-Update: 2022-12-08

Gbp-Pq: Name 1010_gpgme-pkg_search_module.diff

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a747914756c649871fecd3dfef66bc1ab711f055..e8433a7243643203c16554f62c2be48fc37d18a7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -220,13 +220,10 @@ ELSE()
   ENDIF()
 ENDIF( LIBSOLV_SRCDIR AND LIBSOLV_BUILDDIR )
 
-FIND_PACKAGE(Gpgme REQUIRED)
-IF ( NOT GPGME_PTHREAD_FOUND )
-  MESSAGE( FATAL_ERROR " gpgme not found" )
-ELSE()
-  INCLUDE_DIRECTORIES( ${GPGME_INCLUDES} )
-  LINK_DIRECTORIES(${GPGME_LIBRARY_DIR})
-ENDIF()
+pkg_search_module(GPGME REQUIRED gpgme>=1.8.0)
+MESSAGE(STATUS "found gpgme ${GPGME_VERSION}" )
+INCLUDE_DIRECTORIES( ${GPGME_INCLUDE_DIRS} )
+LINK_DIRECTORIES(${GPGME_LIBRARY_DIRS})
 
 FIND_PACKAGE(OpenSSL REQUIRED)
 

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 534f6367c6dc71760220ae8a3298f5486ca16d24..e5e490b3f9ec6040de972269883e7a59964efa18 100644 (file)
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -928,7 +928,7 @@ macro( ADDZYPPLIB LIBNAME )
   TARGET_LINK_LIBRARIES(${LIBNAME} ${CRYPTO_LIBRARIES} )
   TARGET_LINK_LIBRARIES(${LIBNAME} ${SIGNALS_LIBRARY})
   TARGET_LINK_LIBRARIES(${LIBNAME} ${Boost_THREAD_LIBRARY})
-  TARGET_LINK_LIBRARIES(${LIBNAME} ${GPGME_PTHREAD_LIBRARIES})
+  TARGET_LINK_LIBRARIES(${LIBNAME} ${GPGME_LIBRARIES})
   target_link_libraries(${LIBNAME} ${SIGCPP_LIBRARIES})
   target_link_libraries(${LIBNAME} ${LIBGLIB_LIBRARIES})
   target_link_libraries(${LIBNAME} ${YAML_CPP_LIBRARIES})