3759e1163f
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech> Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/15
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
From d13958dabb9f5542d772c6312cd33e4960bf1137 Mon Sep 17 00:00:00 2001
|
|
From: Eric Lemanissier <eric.lemanissier@gmail.com>
|
|
Date: Tue, 29 Nov 2022 09:15:58 +0000
|
|
Subject: [PATCH] fix pcre2 detection
|
|
|
|
Pick-to: 6.3
|
|
Change-Id: I89f167e11bf1c72c9fae474ddd12380636ac5df8
|
|
---
|
|
|
|
diff --git a/cmake/FindWrapSystemPCRE2.cmake b/cmake/FindWrapSystemPCRE2.cmake
|
|
index f8516d3..3ac04b8 100644
|
|
--- a/cmake/FindWrapSystemPCRE2.cmake
|
|
+++ b/cmake/FindWrapSystemPCRE2.cmake
|
|
@@ -6,11 +6,7 @@
|
|
|
|
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)
|