notsoyuzu
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4295 from MerryMage/macOS-libusb 

CMakeLists: Do not search for system libusb on macOS
This commit is contained in:
bunnei 2020-07-11 22:47:52 -04:00 committed by GitHub
parent e5abf11186 6744e7ea4a
commit f16a94fb39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -330,14 +330,15 @@ elseif(SDL2_FOUND)
endif() endif()
# Ensure libusb is properly configured (based on dolphin libusb include) # Ensure libusb is properly configured (based on dolphin libusb include)
if(NOT APPLE)
include(FindPkgConfig) include(FindPkgConfig)
find_package(LibUSB) find_package(LibUSB)
endif()
if (NOT LIBUSB_FOUND) if (NOT LIBUSB_FOUND)
add_subdirectory(externals/libusb) add_subdirectory(externals/libusb)
set(LIBUSB_LIBRARIES usb) set(LIBUSB_LIBRARIES usb)
endif() endif()
# Prefer the -pthread flag on Linux. # Prefer the -pthread flag on Linux.
set(THREADS_PREFER_PTHREAD_FLAG ON) set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)