From 59d5f692f8f563bf6f7c232f971ad764316e4466 Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Thu, 29 Sep 2022 21:46:14 +0200
Subject: build: rely on builtin cmake downloading rather than custom script

DownloadAndExtractFile.cmake was initially introduced as a workaround to
avoid the massive amounts of logs generated by the download progress.
This is not a problem anymore as ExternalProject_Add has had the
DOWNLOAD_NO_PROGRESS option since cmake version 3.1.
---
 cmake.deps/cmake/BuildLibiconv.cmake | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'cmake.deps/cmake/BuildLibiconv.cmake')

diff --git a/cmake.deps/cmake/BuildLibiconv.cmake b/cmake.deps/cmake/BuildLibiconv.cmake
index 169728ab1f..d67b50c3a5 100644
--- a/cmake.deps/cmake/BuildLibiconv.cmake
+++ b/cmake.deps/cmake/BuildLibiconv.cmake
@@ -2,15 +2,9 @@ if(MSVC)
   ExternalProject_Add(libiconv
     PREFIX ${DEPS_BUILD_DIR}
     URL ${LIBICONV_URL}
+    URL_HASH SHA256=${LIBICONV_SHA256}
+    DOWNLOAD_NO_PROGRESS TRUE
     DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libiconv
-    DOWNLOAD_COMMAND ${CMAKE_COMMAND}
-      -DPREFIX=${DEPS_BUILD_DIR}
-      -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/libiconv
-      -DURL=${LIBICONV_URL}
-      -DEXPECTED_SHA256=${LIBICONV_SHA256}
-      -DTARGET=libiconv
-      -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
-      -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
     CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibiconvCMakeLists.txt
         ${DEPS_BUILD_DIR}/src/libiconv/CMakeLists.txt
-- 
cgit