From 6f8e89a9055a0ca9e5465b26f69f137da85b14fd Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Tue, 25 Jan 2022 18:44:44 -0500 Subject: [PATCH] Meta: Download USB and PCI ID data with fallible download function --- CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e43790090a7..feaa273d281 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -286,8 +286,7 @@ set(PCI_IDS_PATH ${CMAKE_BINARY_DIR}/${PCI_IDS_FILE}) set(PCI_IDS_INSTALL_PATH ${CMAKE_INSTALL_DATAROOTDIR}/${PCI_IDS_FILE}) if(ENABLE_PCI_IDS_DOWNLOAD AND NOT EXISTS ${PCI_IDS_GZ_PATH}) - message(STATUS "Downloading PCI ID database from ${PCI_IDS_GZ_URL}...") - file(DOWNLOAD ${PCI_IDS_GZ_URL} ${PCI_IDS_GZ_PATH} INACTIVITY_TIMEOUT 10) + download_file("${PCI_IDS_GZ_URL}" "${PCI_IDS_GZ_PATH}") endif() if(EXISTS ${PCI_IDS_GZ_PATH} AND NOT EXISTS ${PCI_IDS_INSTALL_PATH}) @@ -303,8 +302,7 @@ set(USB_IDS_PATH ${CMAKE_BINARY_DIR}/${USB_IDS_FILE}) set(USB_IDS_INSTALL_PATH ${CMAKE_INSTALL_DATAROOTDIR}/${USB_IDS_FILE}) if(ENABLE_USB_IDS_DOWNLOAD AND NOT EXISTS ${USB_IDS_GZ_PATH}) - message(STATUS "Downloading USB ID database from ${USB_IDS_GZ_URL}...") - file(DOWNLOAD ${USB_IDS_GZ_URL} ${USB_IDS_GZ_PATH} INACTIVITY_TIMEOUT 10) + download_file("${USB_IDS_GZ_URL}" "${USB_IDS_GZ_PATH}") endif() if(EXISTS ${USB_IDS_GZ_PATH} AND NOT EXISTS ${USB_IDS_INSTALL_PATH})