From 2817ef1a53031c3478e5da29187a1377d090e048 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Fri, 11 Jun 2021 16:57:04 -0400 Subject: externals: Don't set FOUND or VERSION on LIBUSB Fixes an issue where libusb.h wouldn't be found when building yuzu on MSVC. This only affects the "traditional" CMake pathway for linking libusb to yuzu AKA MSVC. For autotools we still want to set these variables before configuring SDL. --- externals/libusb/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'externals/libusb/CMakeLists.txt') 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 @@ -set(LIBUSB_FOUND ON CACHE BOOL "libusb is present" FORCE) -set(LIBUSB_VERSION "1.0.24" CACHE STRING "libusb version string" FORCE) - if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) + set(LIBUSB_FOUND ON CACHE BOOL "libusb is present" FORCE) + set(LIBUSB_VERSION "1.0.24" CACHE STRING "libusb version string" FORCE) + # GNU toolchains for some reason doesn't work with the later half of this CMakeLists after # updating to 1.0.24, so we do it the old-fashioned way for now. -- cgit v1.2.3