From 4035cf8d1c3824faef26fc6cfe61b61ed3b4382a Mon Sep 17 00:00:00 2001 From: Harry Mallon Date: Wed, 20 Dec 2023 16:53:59 +0000 Subject: [PATCH] Multi-config / multi-arch schemes now do multiple downloads * Doing one download is a nice optimistion, but it has been broken by cmake 3.28 and its quite messy to re-implement * See https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8823 --- cmake/projects/OpenSSL/schemes/url_sha1_openssl_ios.cmake.in | 2 +- .../projects/OpenSSL/schemes/url_sha1_openssl_macos.cmake.in | 2 +- cmake/projects/botan/schemes/url_sha1_botan_ios.cmake.in | 2 +- .../libsodium/schemes/url_sha1_libsodium_msbuild.cmake.in | 2 +- .../projects/libxml2/schemes/url_sha1_libxml2_msvc.cmake.in | 2 +- cmake/projects/x264/schemes/url_sha1_x264.cmake.in | 2 +- cmake/schemes/git_tag_cmake.cmake.in | 5 +---- cmake/schemes/url_sha1_cmake.cmake.in | 5 +---- 8 files changed, 8 insertions(+), 14 deletions(-) diff --git a/cmake/projects/OpenSSL/schemes/url_sha1_openssl_ios.cmake.in b/cmake/projects/OpenSSL/schemes/url_sha1_openssl_ios.cmake.in index 3d8e2f991b..474a90992e 100644 --- a/cmake/projects/OpenSSL/schemes/url_sha1_openssl_ios.cmake.in +++ b/cmake/projects/OpenSSL/schemes/url_sha1_openssl_ios.cmake.in @@ -137,7 +137,7 @@ foreach(variant @IPHONEOS_ARCHS@ @IPHONESIMULATOR_ARCHS@) URL_HASH SHA1=@HUNTER_PACKAGE_SHA1@ DOWNLOAD_DIR - "@HUNTER_PACKAGE_DOWNLOAD_DIR@" + "@HUNTER_PACKAGE_DOWNLOAD_DIR@/${variant}" TLS_VERIFY "@HUNTER_TLS_VERIFY@" SOURCE_DIR diff --git a/cmake/projects/OpenSSL/schemes/url_sha1_openssl_macos.cmake.in b/cmake/projects/OpenSSL/schemes/url_sha1_openssl_macos.cmake.in index c3b04ed562..a19f7570f1 100644 --- a/cmake/projects/OpenSSL/schemes/url_sha1_openssl_macos.cmake.in +++ b/cmake/projects/OpenSSL/schemes/url_sha1_openssl_macos.cmake.in @@ -181,7 +181,7 @@ foreach(arch ${configure_architectures}) URL_HASH SHA1=@HUNTER_PACKAGE_SHA1@ DOWNLOAD_DIR - "@HUNTER_PACKAGE_DOWNLOAD_DIR@" + "@HUNTER_PACKAGE_DOWNLOAD_DIR@/${arch}" TLS_VERIFY "@HUNTER_TLS_VERIFY@" SOURCE_DIR diff --git a/cmake/projects/botan/schemes/url_sha1_botan_ios.cmake.in b/cmake/projects/botan/schemes/url_sha1_botan_ios.cmake.in index 8a354503db..59262add7e 100644 --- a/cmake/projects/botan/schemes/url_sha1_botan_ios.cmake.in +++ b/cmake/projects/botan/schemes/url_sha1_botan_ios.cmake.in @@ -269,7 +269,7 @@ foreach(variant ${configure_architectures}) URL_HASH SHA1=@HUNTER_PACKAGE_SHA1@ # SHA1 hash DOWNLOAD_DIR - "@HUNTER_PACKAGE_DOWNLOAD_DIR@" # Archive destination location + "@HUNTER_PACKAGE_DOWNLOAD_DIR@/${variant}" # Archive destination location TLS_VERIFY "@HUNTER_TLS_VERIFY@" SOURCE_DIR diff --git a/cmake/projects/libsodium/schemes/url_sha1_libsodium_msbuild.cmake.in b/cmake/projects/libsodium/schemes/url_sha1_libsodium_msbuild.cmake.in index a527973081..3eb69b0d99 100644 --- a/cmake/projects/libsodium/schemes/url_sha1_libsodium_msbuild.cmake.in +++ b/cmake/projects/libsodium/schemes/url_sha1_libsodium_msbuild.cmake.in @@ -123,7 +123,7 @@ foreach(build_config_type @HUNTER_PACKAGE_CONFIGURATION_TYPES@) URL_HASH SHA1=@HUNTER_PACKAGE_SHA1@ DOWNLOAD_DIR - "@HUNTER_PACKAGE_DOWNLOAD_DIR@" + "@HUNTER_PACKAGE_DOWNLOAD_DIR@/${build_config_type}" TLS_VERIFY "@HUNTER_TLS_VERIFY@" SOURCE_DIR diff --git a/cmake/projects/libxml2/schemes/url_sha1_libxml2_msvc.cmake.in b/cmake/projects/libxml2/schemes/url_sha1_libxml2_msvc.cmake.in index 8cf10c8ca2..a13fe84690 100644 --- a/cmake/projects/libxml2/schemes/url_sha1_libxml2_msvc.cmake.in +++ b/cmake/projects/libxml2/schemes/url_sha1_libxml2_msvc.cmake.in @@ -84,7 +84,7 @@ foreach(build_config_type @HUNTER_PACKAGE_CONFIGURATION_TYPES@) URL_HASH SHA1=@HUNTER_PACKAGE_SHA1@ DOWNLOAD_DIR - "@HUNTER_PACKAGE_DOWNLOAD_DIR@" + "@HUNTER_PACKAGE_DOWNLOAD_DIR@/${build_config_type}" TLS_VERIFY "@HUNTER_TLS_VERIFY@" SOURCE_DIR diff --git a/cmake/projects/x264/schemes/url_sha1_x264.cmake.in b/cmake/projects/x264/schemes/url_sha1_x264.cmake.in index a8a41defac..faaab356b5 100644 --- a/cmake/projects/x264/schemes/url_sha1_x264.cmake.in +++ b/cmake/projects/x264/schemes/url_sha1_x264.cmake.in @@ -308,7 +308,7 @@ else() URL_HASH SHA1=@HUNTER_PACKAGE_SHA1@ DOWNLOAD_DIR - "@HUNTER_PACKAGE_DOWNLOAD_DIR@" + "@HUNTER_PACKAGE_DOWNLOAD_DIR@/${ios_architecture}" TLS_VERIFY "@HUNTER_TLS_VERIFY@" SOURCE_DIR diff --git a/cmake/schemes/git_tag_cmake.cmake.in b/cmake/schemes/git_tag_cmake.cmake.in index 39f0db8748..9c83d1a948 100644 --- a/cmake/schemes/git_tag_cmake.cmake.in +++ b/cmake/schemes/git_tag_cmake.cmake.in @@ -129,9 +129,6 @@ else() endif() foreach(configuration ${configuration_types}) - # All configurations use the same URL which will be downloaded only once - # i.e. overhead only for unpacking archive + no files from the previous - # build will be left in case package do some insource modification (wrongly) string(TOUPPER "${configuration}" configuration_upper) string(COMPARE EQUAL "${configuration_upper}" "RELEASE" is_release) set(postfix_name "CMAKE_${configuration_upper}_POSTFIX") @@ -168,7 +165,7 @@ foreach(configuration ${configuration_types}) GIT_SHALLOW ${http_credentials} DOWNLOAD_DIR - "@HUNTER_PACKAGE_DOWNLOAD_DIR@" + "@HUNTER_PACKAGE_DOWNLOAD_DIR@/${configuration}" TLS_VERIFY "@HUNTER_TLS_VERIFY@" SOURCE_DIR diff --git a/cmake/schemes/url_sha1_cmake.cmake.in b/cmake/schemes/url_sha1_cmake.cmake.in index dc3074ca56..42f202a265 100644 --- a/cmake/schemes/url_sha1_cmake.cmake.in +++ b/cmake/schemes/url_sha1_cmake.cmake.in @@ -129,9 +129,6 @@ else() endif() foreach(configuration ${configuration_types}) - # All configurations use the same URL which will be downloaded only once - # i.e. overhead only for unpacking archive + no files from the previous - # build will be left in case package do some insource modification (wrongly) string(TOUPPER "${configuration}" configuration_upper) string(COMPARE EQUAL "${configuration_upper}" "RELEASE" is_release) set(postfix_name "CMAKE_${configuration_upper}_POSTFIX") @@ -167,7 +164,7 @@ foreach(configuration ${configuration_types}) SHA1=@HUNTER_PACKAGE_SHA1@ ${http_credentials} DOWNLOAD_DIR - "@HUNTER_PACKAGE_DOWNLOAD_DIR@" + "@HUNTER_PACKAGE_DOWNLOAD_DIR@/${configuration}" TLS_VERIFY "@HUNTER_TLS_VERIFY@" SOURCE_DIR