From be4352cb841a7879f088d6d5e8bff85f5a01fe3e Mon Sep 17 00:00:00 2001 From: Eric Lemanissier Date: Tue, 29 Nov 2022 09:15:58 +0000 Subject: [PATCH] fix pcre2 detection pcre2-16 is not the target name provided by the upstream Config file. It is PCRE2::16BIT. https://github.com/PCRE2Project/pcre2/blob/2410fbe3869cab403f02b94caa9ab37ee9f5854b/cmake/pcre2-config.cmake.in#L122 Pick-to: 6.2 6.4 Change-Id: I89f167e11bf1c72c9fae474ddd12380636ac5df8 Reviewed-by: Alexandru Croitor --- cmake/FindWrapSystemPCRE2.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmake/FindWrapSystemPCRE2.cmake b/cmake/FindWrapSystemPCRE2.cmake index fee166bc550..28dc1d5d21e 100644 --- a/cmake/FindWrapSystemPCRE2.cmake +++ b/cmake/FindWrapSystemPCRE2.cmake @@ -9,11 +9,7 @@ set(WrapSystemPCRE2_REQUIRED_VARS __pcre2_found) find_package(PCRE2 ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} COMPONENTS 16BIT QUIET) -# TODO: pcre2-16 is not the target name provided by the upstream Config file. It is PCRE2::16BIT. -# https://github.com/PCRE2Project/pcre2/blob/2410fbe3869cab403f02b94caa9ab37ee9f5854b/cmake/pcre2-config.cmake.in#L122 -# We don't strictly need to handle that though, because the pkg-config code path below still -# finds the correct libraries. -set(__pcre2_target_name "PCRE2::pcre2-16") +set(__pcre2_target_name "PCRE2::16BIT") if(PCRE2_FOUND AND TARGET "${__pcre2_target_name}") # Hunter case. set(__pcre2_found TRUE)