diff --git a/ChangeLog b/ChangeLog index e2dbf357..84433de5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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, diff --git a/cmake/modules/FindLibidn2.cmake b/cmake/modules/FindLibidn2.cmake index 4ea374f5..0ddcbc28 100644 --- 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()