From c1e6316bdc72ba5ab44332f4d530bfd79f9f6637 Mon Sep 17 00:00:00 2001 From: Guilherme Janczak Date: Mon, 6 May 2024 17:44:32 +0000 Subject: [PATCH] use pkg-config to find libusb This makes more (but not all) of the compilation process succeed on NetBSD. --- CMakeLists.txt | 4 +++- Externals/hidapi/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f8e845d0f..665765d2c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -703,7 +703,9 @@ include_directories(Externals/soundtouch) dolphin_find_optional_system_library(CUBEB Externals/cubeb) if(NOT ANDROID) - dolphin_find_optional_system_library(LibUSB Externals/libusb) + dolphin_find_optional_system_library_pkgconfig( + LibUSB libusb-1.0 LibUSB::LibUSB Externals/libusb + ) add_definitions(-D__LIBUSB__) endif() diff --git a/Externals/hidapi/CMakeLists.txt b/Externals/hidapi/CMakeLists.txt index 6ea9d24e4f..210643caf0 100644 --- a/Externals/hidapi/CMakeLists.txt +++ b/Externals/hidapi/CMakeLists.txt @@ -15,7 +15,7 @@ else() target_link_libraries(hidapi PRIVATE udev) else() target_sources(hidapi PRIVATE hidapi-src/libusb/hid.c) - target_link_libraries(hidapi PRIVATE ${LIBUSB_LIBRARIES}) + target_link_libraries(hidapi PRIVATE LibUSB::LibUSB) endif() endif()