Browse Source
Merge pull request #4295 from MerryMage/macOS-libusb
CMakeLists: Do not search for system libusb on macOS
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
3 deletions
-
CMakeLists.txt
|
|
|
@ -330,14 +330,15 @@ elseif(SDL2_FOUND) |
|
|
|
endif() |
|
|
|
|
|
|
|
# Ensure libusb is properly configured (based on dolphin libusb include) |
|
|
|
include(FindPkgConfig) |
|
|
|
find_package(LibUSB) |
|
|
|
if(NOT APPLE) |
|
|
|
include(FindPkgConfig) |
|
|
|
find_package(LibUSB) |
|
|
|
endif() |
|
|
|
if (NOT LIBUSB_FOUND) |
|
|
|
add_subdirectory(externals/libusb) |
|
|
|
set(LIBUSB_LIBRARIES usb) |
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
# Prefer the -pthread flag on Linux. |
|
|
|
set(THREADS_PREFER_PTHREAD_FLAG ON) |
|
|
|
find_package(Threads REQUIRED) |
|
|
|
|