From b1ece6f78bc6fd4e16987a819ecafe329b2fba10 Mon Sep 17 00:00:00 2001
From: Harry Mallon <harry.mallon@codex.online>
Date: Tue, 20 Dec 2022 18:24:39 +0000
Subject: [PATCH] Use Hunter to download zstd

---
 CMakeLists.txt | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3358238cfe18..a36aba11c0d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -731,18 +731,28 @@ endif()
 option(CURL_ZSTD "Set to ON to enable building curl with zstd support." OFF)
 set(HAVE_ZSTD OFF)
 if(CURL_ZSTD)
-  find_package(Zstd REQUIRED)
-  if (NOT DEFINED HAVE_ZSTD_CREATEDSTREAM)
-    cmake_push_check_state()
-    set(CMAKE_REQUIRED_INCLUDES ${Zstd_INCLUDE_DIRS})
-    set(CMAKE_REQUIRED_LIBRARIES ${Zstd_LIBRARIES})
-    check_symbol_exists(ZSTD_createDStream "zstd.h" HAVE_ZSTD_CREATEDSTREAM)
-    cmake_pop_check_state()
-  endif()
-  if(Zstd_FOUND AND HAVE_ZSTD_CREATEDSTREAM)
-    set(HAVE_ZSTD ON)
-    list(APPEND CURL_LIBS ${Zstd_LIBRARIES})
-    include_directories(${Zstd_INCLUDE_DIRS})
+  hunter_add_package(zstd)
+  if(HUNTER_ENABLED)
+    find_package(zstd REQUIRED)
+    if(Zstd_FOUND AND HAVE_ZSTD_CREATEDSTREAM)
+      set(HAVE_ZSTD ON)
+      list(APPEND CURL_LIBS zstd::libzstd_static)
+      include_directories(${ZSTD_INCLUDE_DIRS})
+    endif()
+  else()
+    find_package(Zstd REQUIRED)
+    if (NOT DEFINED HAVE_ZSTD_CREATEDSTREAM)
+      cmake_push_check_state()
+      set(CMAKE_REQUIRED_INCLUDES ${Zstd_INCLUDE_DIRS})
+      set(CMAKE_REQUIRED_LIBRARIES ${Zstd_LIBRARIES})
+      check_symbol_exists(ZSTD_createDStream "zstd.h" HAVE_ZSTD_CREATEDSTREAM)
+      cmake_pop_check_state()
+    endif()
+    if(Zstd_FOUND AND HAVE_ZSTD_CREATEDSTREAM)
+      set(HAVE_ZSTD ON)
+      list(APPEND CURL_LIBS ${Zstd_LIBRARIES})
+      include_directories(${Zstd_INCLUDE_DIRS})
+    endif()
   endif()
 endif()