1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From: Sophie Brun <sophie@kali.org>
Date: Wed, 28 Dec 2022 11:21:38 +0100
Subject: Fix build with new gpgme
Drop gpgme-config hack to find gpgme, since this file doesn't exist anymore
Author: Gianfranco Costamagna <locutusofborg@debian.org>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1024810
---
src/CMakeLists.txt | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7ec0d31..bd37a6f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -94,26 +94,7 @@ else(NOT XSLTPROC_EXECUTABLE)
message(STATUS "Looking for xsltproc... ${XSLTPROC_EXECUTABLE}")
endif(NOT XSLTPROC_EXECUTABLE)
-if(NOT GPGME_FOUND)
- # fallback for older gpgme versions without gpgme.pc file
- message(STATUS "Looking for gpgme...")
- find_library(GPGME gpgme)
- if(NOT GPGME)
- message(SEND_ERROR "The gpgme library is required.")
- else(NOT GPGME)
- message(STATUS "Looking for gpgme... ${GPGME}")
- execute_process(
- COMMAND gpgme-config --cflags
- OUTPUT_VARIABLE GPGME_CFLAGS
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- execute_process(
- COMMAND gpgme-config --libs
- OUTPUT_VARIABLE GPGME_LDFLAGS
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- endif(NOT GPGME)
-endif(NOT GPGME_FOUND)
+pkg_check_modules (GPGME REQUIRED gpgme)
if(WITH_LIBTHEIA)
find_package(Theia 1.0.0 REQUIRED)
|
