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
|
Description: Fix FindLibidn2.cmake
Origin: upstream
Squash patches from
- Category: Strengthen LibIDN2 version determination during cmake run
From: Joel Bion <jpbion@westvi.com>
Date: Wed, 20 Jul 2022 16:01:25 -0700
(cherry picked from commit ed7bfa107e9e63ddaf9ac4f17482ebff302b8ce3)
- Fix typo in cmake module for libidn2
From: Sara Dickinson <sara@sinodun.com>
Date: Thu, 21 Jul 2022 14:17:53 +0100
(cherry picked from commit 9d8eea97a523d828b7d1a04352bbd2202b914519)
---
--- a/cmake/modules/FindLibidn2.cmake
+++ b/cmake/modules/FindLibidn2.cmake
@@ -52,9 +52,9 @@ if (LIBIDN2_INCLUDE_DIR AND LIBIDN2_LIBRARY)
)
endif ()
- if (NOT LIBIDN2_VERSION AND LIBIDN2_INCLUDE_DIR AND EXISTS "${LIBIDN2_INCLUDE_DIR}/unbound.h")
- file(STRINGS "${LIBIDN2_INCLUDE_DIR}/idn2.h" LIBIDN2_H REGEX "^#define IDN2_VERSION ")
- string(REGEX REPLACE "^.*IDN2_VERSION \"([0-9.]+)\".*$" "\\1" LIBIDN2_VERSION "${LIBIDN2_H}")
+ if (NOT LIBIDN2_VERSION AND LIBIDN2_INCLUDE_DIR AND EXISTS "${LIBIDN2_INCLUDE_DIR}/idn2.h")
+ file(STRINGS "${LIBIDN2_INCLUDE_DIR}/idn2.h" LIBIDN2_H REGEX "^[ \t]*#[ \t]*define[ \t]+IDN2_VERSION[ \t]")
+ string(REGEX REPLACE "^.*IDN2_VERSION[ \t]+\"([0-9.]+)\".*$" "\\1" LIBIDN2_VERSION "${LIBIDN2_H}")
endif ()
endif()
|
