diff options
| author |  Ameer J | 2021-07-27 21:26:17 -0400 |
|---|---|---|
| committer |  GitHub | 2021-07-27 21:26:17 -0400 |
| commit | d923ec5805e6cecde138559515ec5920f45fc452 (patch) | |
| tree | 58e75b147be17165052f31878bab13a2e2922dae | |
| parent | Merge pull request #6749 from lioncash/rtarget (diff) | |
| parent | cmake: don't use pkg-config directly with non-reference libusb (diff) | |
| download | yuzu-d923ec5805e6cecde138559515ec5920f45fc452.tar.gz yuzu-d923ec5805e6cecde138559515ec5920f45fc452.tar.xz yuzu-d923ec5805e6cecde138559515ec5920f45fc452.zip | |
Merge pull request #6753 from jbeich/libusb
cmake: unbreak libusb detection on FreeBSD
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 857550e71..d98ba7767 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -496,7 +496,7 @@ endif() | |||
| 496 | # Ensure libusb is properly configured (based on dolphin libusb include) | 496 | # Ensure libusb is properly configured (based on dolphin libusb include) |
| 497 | if(NOT APPLE AND NOT YUZU_USE_BUNDLED_LIBUSB) | 497 | if(NOT APPLE AND NOT YUZU_USE_BUNDLED_LIBUSB) |
| 498 | include(FindPkgConfig) | 498 | include(FindPkgConfig) |
| 499 | if (PKG_CONFIG_FOUND) | 499 | if (PKG_CONFIG_FOUND AND NOT CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD") |
| 500 | pkg_check_modules(LIBUSB QUIET libusb-1.0>=1.0.24) | 500 | pkg_check_modules(LIBUSB QUIET libusb-1.0>=1.0.24) |
| 501 | else() | 501 | else() |
| 502 | find_package(LibUSB) | 502 | find_package(LibUSB) |