diff options
| author | 2020-07-11 22:47:52 -0400 | |
|---|---|---|
| committer | 2020-07-11 22:47:52 -0400 | |
| commit | f16a94fb39ef0a689975a21cdbe5dab35ba08cae (patch) | |
| tree | da78bf08d0e5c352388b1f7cee4f5f04eb4c3c79 | |
| parent | Merge pull request #4305 from yuzu-emu/revert-4300-port-5441 (diff) | |
| parent | CMakeLists: Do not search for system libusb on macOS (diff) | |
| download | yuzu-f16a94fb39ef0a689975a21cdbe5dab35ba08cae.tar.gz yuzu-f16a94fb39ef0a689975a21cdbe5dab35ba08cae.tar.xz yuzu-f16a94fb39ef0a689975a21cdbe5dab35ba08cae.zip | |
Merge pull request #4295 from MerryMage/macOS-libusb
CMakeLists: Do not search for system libusb on macOS
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c0e49c03..88ea04c08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -330,14 +330,15 @@ elseif(SDL2_FOUND) | |||
| 330 | endif() | 330 | endif() |
| 331 | 331 | ||
| 332 | # Ensure libusb is properly configured (based on dolphin libusb include) | 332 | # Ensure libusb is properly configured (based on dolphin libusb include) |
| 333 | include(FindPkgConfig) | 333 | if(NOT APPLE) |
| 334 | find_package(LibUSB) | 334 | include(FindPkgConfig) |
| 335 | find_package(LibUSB) | ||
| 336 | endif() | ||
| 335 | if (NOT LIBUSB_FOUND) | 337 | if (NOT LIBUSB_FOUND) |
| 336 | add_subdirectory(externals/libusb) | 338 | add_subdirectory(externals/libusb) |
| 337 | set(LIBUSB_LIBRARIES usb) | 339 | set(LIBUSB_LIBRARIES usb) |
| 338 | endif() | 340 | endif() |
| 339 | 341 | ||
| 340 | |||
| 341 | # Prefer the -pthread flag on Linux. | 342 | # Prefer the -pthread flag on Linux. |
| 342 | set(THREADS_PREFER_PTHREAD_FLAG ON) | 343 | set(THREADS_PREFER_PTHREAD_FLAG ON) |
| 343 | find_package(Threads REQUIRED) | 344 | find_package(Threads REQUIRED) |