diff options
| author |  bunnei | 2021-06-11 16:29:34 -0700 |
|---|---|---|
| committer |  GitHub | 2021-06-11 16:29:34 -0700 |
| commit | 8b5655a98e380a38436bb6002c55d9ba9cf8f16d (patch) | |
| tree | 423e61e5b148f7b2d9c0bc5d47298587cc2295cc | |
| parent | Merge pull request #6451 from Morph1984/check-disk-space-dump (diff) | |
| parent | externals: Don't set FOUND or VERSION on LIBUSB (diff) | |
| download | yuzu-8b5655a98e380a38436bb6002c55d9ba9cf8f16d.tar.gz yuzu-8b5655a98e380a38436bb6002c55d9ba9cf8f16d.tar.xz yuzu-8b5655a98e380a38436bb6002c55d9ba9cf8f16d.zip | |
Merge pull request #6453 from lat9nq/libusb-fix-msvc
externals: Don't set FOUND or VERSION on LIBUSB
| -rw-r--r-- | externals/libusb/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/externals/libusb/CMakeLists.txt b/externals/libusb/CMakeLists.txt index 06ce0fba7..7180fd42a 100644 --- a/externals/libusb/CMakeLists.txt +++ b/externals/libusb/CMakeLists.txt | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | set(LIBUSB_FOUND ON CACHE BOOL "libusb is present" FORCE) | ||
| 2 | set(LIBUSB_VERSION "1.0.24" CACHE STRING "libusb version string" FORCE) | ||
| 3 | |||
| 4 | if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) | 1 | if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) |
| 2 | set(LIBUSB_FOUND ON CACHE BOOL "libusb is present" FORCE) | ||
| 3 | set(LIBUSB_VERSION "1.0.24" CACHE STRING "libusb version string" FORCE) | ||
| 4 | |||
| 5 | # GNU toolchains for some reason doesn't work with the later half of this CMakeLists after | 5 | # GNU toolchains for some reason doesn't work with the later half of this CMakeLists after |
| 6 | # updating to 1.0.24, so we do it the old-fashioned way for now. | 6 | # updating to 1.0.24, so we do it the old-fashioned way for now. |
| 7 | 7 | ||