From 0e93472733de9d8c957196c17ac4ce285038db69 Mon Sep 17 00:00:00 2001 From: Pavlo Kleymonov Date: Mon, 26 Jan 2026 16:52:39 +0100 Subject: [PATCH 1/2] fix for PCRE2 find_package() --- src/CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f0312c636..149df619e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -548,13 +548,19 @@ if(WITH_GNUTLS) endif() if(WITH_PCRE2) - pkg_check_modules(PCRE2 libpcre2-8) + find_package(PCRE2 REQUIRED 8BIT CONFIG) if(PCRE2_FOUND) - set(PCRE_LDFLAGS "${PCRE2_LDFLAGS}") + set(PCRE_LDFLAGS PCRE2::8BIT) set(PCRE_CFLAGS "${PCRE2_CFLAGS}") else() - ## if we have pcre2-config, use it - xconfig(pcre2-config PCRE_LDFLAGS PCRE_CFLAGS) + pkg_check_modules(PCRE2 libpcre2-8) + if(PCRE2_FOUND) + set(PCRE_LDFLAGS "${PCRE2_LDFLAGS}") + set(PCRE_CFLAGS "${PCRE2_CFLAGS}") + else() + ## if we have pcre2-config, use it + xconfig(pcre2-config PCRE_LDFLAGS PCRE_CFLAGS) + endif() endif() if(PCRE_LDFLAGS OR PCRE_CFLAGS) message(STATUS "found pcre2 at: LDFLAGS: ${PCRE_LDFLAGS} CFLAGS: ${PCRE_CFLAGS}") From 1ab615137282fd2cb88c0a65d3e8eb31ec0f7fb6 Mon Sep 17 00:00:00 2001 From: Pavlo Kleymonov Date: Mon, 2 Feb 2026 15:18:17 +0100 Subject: [PATCH 2/2] ignore an error when PCRE2 package configuration file cannot be found --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 149df619e..68adb7b17 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -548,7 +548,7 @@ if(WITH_GNUTLS) endif() if(WITH_PCRE2) - find_package(PCRE2 REQUIRED 8BIT CONFIG) + find_package(PCRE2 QUIET) if(PCRE2_FOUND) set(PCRE_LDFLAGS PCRE2::8BIT) set(PCRE_CFLAGS "${PCRE2_CFLAGS}")