Skip to content

Commit

Permalink
Fix: Fix linking to gpgme
Browse files Browse the repository at this point in the history
Use pkg-config to search for gpgme linker flags. The gpgme-config tool
is deprecated and removed in a newer gpgme version. The gpgme package
comes already with a gpgme.pc file for pkg-config on Debian bullseye.
  • Loading branch information
bjoernricks committed Jun 16, 2023
1 parent 2a93ac3 commit 41bd812
Showing 1 changed file with 17 additions and 13 deletions.
30 changes: 17 additions & 13 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ pkg_check_modules (GNUTLS REQUIRED gnutls>=3.2.15)
pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42)
pkg_check_modules (LIBBSD REQUIRED libbsd)
pkg_check_modules (LIBICAL REQUIRED libical>=1.00)
pkg_check_modules (GPGME REQUIRED gpgme)

message (STATUS "Looking for PostgreSQL...")
find_program (PG_CONFIG_EXECUTABLE pg_config DOC "pg_config")
Expand Down Expand Up @@ -70,19 +71,22 @@ else (NOT XSLTPROC_EXECUTABLE)
message (STATUS "Looking for xsltproc... ${XSLTPROC_EXECUTABLE}")
endif (NOT XSLTPROC_EXECUTABLE)

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)
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)

if (WITH_LIBTHEIA)
find_package(Theia 1.0.0 REQUIRED)
Expand Down

0 comments on commit 41bd812

Please sign in to comment.