Merge branch 'develop' into use_dot_alpn

Fix typo in cmake module for libidn2
Merge pull request #522 from jpbion/fixlibidn2
2022-08-09 16:54:20 +02:00 · 2022-07-21 14:17:53 +01:00 · 2022-07-21 14:14:35 +01:00 · 2022-07-20 16:01:25 -07:00
2 changed files with 6 additions and 4 deletions
--- a/4
+++ b/4
@ -1,5 +1,7 @@
-* 2022-06-: Version 1.7.1
+* 2022-08-12: Version 1.7.1
  * Always send the `dot` ALPN when using DoT
  * Strengthen version determination for Libidn2 during cmake processing (thanks
    jpbion).
 * 2021-06-04: Version 1.7.0
  * Make TLS Handshake timeout max 4/5th of timeout for the query,
--- 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")
+  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 "^#define IDN2_VERSION ")
+    file(STRINGS "${LIBIDN2_INCLUDE_DIR}/idn2.h" LIBIDN2_H REGEX "^[ \t]*#[ \t]*define[ \t]+IDN2_VERSION[ \t]")
-    string(REGEX REPLACE "^.*IDN2_VERSION \"([0-9.]+)\".*$" "\\1" LIBIDN2_VERSION "${LIBIDN2_H}")
+    string(REGEX REPLACE "^.*IDN2_VERSION[ \t]+\"([0-9.]+)\".*$" "\\1" LIBIDN2_VERSION "${LIBIDN2_H}")
  endif ()
 endif()
Author	SHA1	Message	Date
Willem Toorop	2bbac1163b	Merge branch 'develop' into use_dot_alpn	2022-08-09 16:54:20 +02:00
Sara Dickinson	9d8eea97a5	Fix typo in cmake module for libidn2	2022-07-21 14:17:53 +01:00
Sara Dickinson	c0e45395b8	Merge pull request #522 from jpbion/fixlibidn2 Category: Strengthen LibIDN2 version determination during cmake run	2022-07-21 14:14:35 +01:00
Joel Bion	ed7bfa107e	Category: Strengthen LibIDN2 version determination during cmake run	2022-07-20 16:01:25 -07:00