From 0ee6e2ed86c8df9125c5ac35f95a79e4551272e5 Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Sat, 4 Oct 2025 03:38:04 +0100 Subject: [PATCH 69/75] FindLIBUSB.cmake: Fix inconsistency in LIBUSB_LIBRARY_NAME[S] vars. --- host/cmake/modules/FindLIBUSB.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/host/cmake/modules/FindLIBUSB.cmake b/host/cmake/modules/FindLIBUSB.cmake index 512d6b65..c5686e04 100644 --- a/host/cmake/modules/FindLIBUSB.cmake +++ b/host/cmake/modules/FindLIBUSB.cmake @@ -24,9 +24,9 @@ else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) find_package(PkgConfig) pkg_check_modules(PC_LIBUSB libusb-1.0) - set(LIBUSB_LIBRARY_NAME usb-1.0) + set(LIBUSB_LIBRARY_NAMES usb-1.0) if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - set(LIBUSB_LIBRARY_NAME usb) + set(LIBUSB_LIBRARY_NAMES usb) elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") # vcpkg's libusb-1.0 has a "lib" prefix, but on Windows MVSC, CMake doesn't # search for static libraries with lib prefixes automatically. @@ -38,7 +38,7 @@ else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) find_library( LIBUSB_LIBRARIES - NAMES ${LIBUSB_LIBRARY_NAME} + NAMES ${LIBUSB_LIBRARY_NAMES} PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) -- 2.47.3