From 1e36d5449304226b097a4929a90f846c0ddf1d76 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 15 Mar 2023 15:50:57 +0000 Subject: [PATCH] Meta: Make sure directories for pci.ids and usb.ids exist `file(COPY_FILE ...)` fails if the target directory does not already exist, whereas `install(FILES ... DESTINATION ...)` happily creates all the required directories. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ff5a229bc..66bb460c9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,7 +252,7 @@ set(PCI_IDS_INSTALL_PATH "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/$ if (ENABLE_PCI_IDS_DOWNLOAD AND NOT EXISTS "${PCI_IDS_INSTALL_PATH}") download_file("${PCI_IDS_URL}" "${PCI_IDS_DOWNLOAD_PATH}") - file(COPY_FILE "${PCI_IDS_DOWNLOAD_PATH}" "${PCI_IDS_INSTALL_PATH}") + install(FILES "${PCI_IDS_DOWNLOAD_PATH}" DESTINATION "${PCI_IDS_INSTALL_PATH}") endif() set(USB_IDS_FILE usb.ids) @@ -262,5 +262,5 @@ set(USB_IDS_INSTALL_PATH "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/$ if (ENABLE_USB_IDS_DOWNLOAD AND NOT EXISTS "${USB_IDS_INSTALL_PATH}") download_file("${USB_IDS_URL}" "${USB_IDS_DOWNLOAD_PATH}") - file(COPY_FILE "${USB_IDS_DOWNLOAD_PATH}" "${USB_IDS_INSTALL_PATH}") + install(FILES "${USB_IDS_DOWNLOAD_PATH}" DESTINATION "${USB_IDS_INSTALL_PATH}") endif()