diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-17 15:00:52 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-17 15:00:52 +0000 |
commit | 0f157e7d6c4be48f213ea022cb2d6d1316c423c8 (patch) | |
tree | ff4ad271b50a39e23d5a50a54f4bff37342cdc1c /CMakeLists.txt | |
parent | Adding debian version 4.2.4-1. (diff) | |
download | wireshark-0f157e7d6c4be48f213ea022cb2d6d1316c423c8.tar.xz wireshark-0f157e7d6c4be48f213ea022cb2d6d1316c423c8.zip |
Merging upstream version 4.2.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 132e4a94..155e0a43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ endif() # Updated by tools/make-version.py set(PROJECT_MAJOR_VERSION 4) set(PROJECT_MINOR_VERSION 2) -set(PROJECT_PATCH_VERSION 4) +set(PROJECT_PATCH_VERSION 5) set(PROJECT_BUILD_VERSION 0) set(PROJECT_VERSION_EXTENSION "") @@ -1201,6 +1201,10 @@ find_package(GCRYPT "1.8.0" REQUIRED) # C Asynchronous resolver reset_find_package(CARES) find_package(CARES "1.13.0" REQUIRED) +if (CARES_VERSION VERSION_GREATER_EQUAL "1.28.0") + # Suppress deprecation warnings. + add_compile_definitions(CARES_NO_DEPRECATED) +endif () find_package(LEX REQUIRED) find_package(Perl) find_package(PCRE2 REQUIRED) |