From b8c6d3d7e1be646b9ea31e504d014cf3e3515521 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Sat, 10 Sep 2022 13:41:29 +0200 Subject: [PATCH] cmake: mark hidapi as disabled when not found (cherry-picked from commit 19b13aab98ef02c93ed356af639d1e4ed0254906) (cherry-picked from commit c3495ec6eaaaf9f0d3250a9d39356154b869251c) (cherry-picked from commit 6dfd7a17e1d9ea94015bb0fda4c570f8b20781bd) --- cmake/sdlchecks.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake index e062043c9..8b7eb03a6 100644 --- a/cmake/sdlchecks.cmake +++ b/cmake/sdlchecks.cmake @@ -1192,6 +1192,7 @@ macro(CheckHIDAPI) if(HIDAPI_ONLY_LIBUSB AND NOT HAVE_LIBUSB) set(HAVE_HIDAPI FALSE) endif() + set(HAVE_HIDAPI_LIBUSB ${HAVE_LIBUSB}) endif() if(HAVE_HIDAPI) @@ -1211,6 +1212,8 @@ macro(CheckHIDAPI) file(GLOB HIDAPI_JOYSTICK_SOURCES ${SDL2_SOURCE_DIR}/src/joystick/hidapi/*.c) list(APPEND SOURCE_FILES ${HIDAPI_JOYSTICK_SOURCES}) endif() + else() + set(SDL_HIDAPI_DISABLED 1) endif() else() set(SDL_HIDAPI_DISABLED 1)