summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2020-07-11 22:47:52 -0400
committerGravatar GitHub2020-07-11 22:47:52 -0400
commitf16a94fb39ef0a689975a21cdbe5dab35ba08cae (patch)
treeda78bf08d0e5c352388b1f7cee4f5f04eb4c3c79
parentMerge pull request #4305 from yuzu-emu/revert-4300-port-5441 (diff)
parentCMakeLists: Do not search for system libusb on macOS (diff)
downloadyuzu-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.txt7
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)
330endif() 330endif()
331 331
332# Ensure libusb is properly configured (based on dolphin libusb include) 332# Ensure libusb is properly configured (based on dolphin libusb include)
333include(FindPkgConfig) 333if(NOT APPLE)
334find_package(LibUSB) 334 include(FindPkgConfig)
335 find_package(LibUSB)
336endif()
335if (NOT LIBUSB_FOUND) 337if (NOT LIBUSB_FOUND)
336 add_subdirectory(externals/libusb) 338 add_subdirectory(externals/libusb)
337 set(LIBUSB_LIBRARIES usb) 339 set(LIBUSB_LIBRARIES usb)
338endif() 340endif()
339 341
340
341# Prefer the -pthread flag on Linux. 342# Prefer the -pthread flag on Linux.
342set(THREADS_PREFER_PTHREAD_FLAG ON) 343set(THREADS_PREFER_PTHREAD_FLAG ON)
343find_package(Threads REQUIRED) 344find_package(Threads REQUIRED)