ソースを参照

Meta: Download USB and PCI ID data with fallible download function

Timothy Flynn 3 年 前
コミット
6f8e89a905
1 ファイル変更2 行追加4 行削除
  1. 2 4
      CMakeLists.txt

+ 2 - 4
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})