From 9af91eb6228831570bef59bfd9bf0ef46d140382 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Wed, 5 Jun 2024 09:09:46 -0700 Subject: [PATCH] Meta: ENABLE_NETWORK_DOWNLOADS for ca_certificates and public_suffix --- Meta/CMake/ca_certificates_data.cmake | 6 +++++- Meta/CMake/public_suffix.cmake | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Meta/CMake/ca_certificates_data.cmake b/Meta/CMake/ca_certificates_data.cmake index fed998b5fb7..35579ee9269 100644 --- a/Meta/CMake/ca_certificates_data.cmake +++ b/Meta/CMake/ca_certificates_data.cmake @@ -13,7 +13,11 @@ set(CACERT_INSTALL_FILE cacert.pem) if (ENABLE_CACERT_DOWNLOAD) remove_path_if_version_changed("${CACERT_VERSION}" "${CACERT_VERSION_FILE}" "${CACERT_PATH}") - download_file("${CACERT_URL}" "${CACERT_PATH}/${CACERT_FILE}" SHA256 "${CACERT_SHA256}") + if (ENABLE_NETWORK_DOWNLOADS) + download_file("${CACERT_URL}" "${CACERT_PATH}/${CACERT_FILE}" SHA256 "${CACERT_SHA256}") + else() + message(STATUS "Skipping download of ${CACERT_URL}, expecting it to have been downloaded to ${CACERT_PATH}") + endif() if (NOT "${CMAKE_STAGING_PREFIX}" STREQUAL "") set(CACERT_INSTALL_PATH ${CMAKE_STAGING_PREFIX}/etc/${CACERT_INSTALL_FILE}) diff --git a/Meta/CMake/public_suffix.cmake b/Meta/CMake/public_suffix.cmake index e37dee1f07c..42a8377692f 100644 --- a/Meta/CMake/public_suffix.cmake +++ b/Meta/CMake/public_suffix.cmake @@ -8,7 +8,11 @@ if (ENABLE_PUBLIC_SUFFIX_DOWNLOAD) set(PUBLIC_SUFFIX_DATA_HEADER PublicSuffixData.h) set(PUBLIC_SUFFIX_DATA_IMPLEMENTATION PublicSuffixData.cpp) - download_file("${PUBLIC_SUFFIX_DATA_URL}" "${PUBLIC_SUFFIX_DATA_PATH}") + if (ENABLE_NETWORK_DOWNLOADS) + download_file("${PUBLIC_SUFFIX_DATA_URL}" "${PUBLIC_SUFFIX_DATA_PATH}") + else() + message(STATUS "Skipping download of ${PUBLIC_SUFFIX_DATA_URL}, expecting it to be in ${PUBLIC_SUFFIX_DATA_PATH}") + endif() invoke_generator( "PublicSuffixData" Lagom::GeneratePublicSuffixData