encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: Fix locating libusb header at configure-time 

Removing the CheckUSBHID call is necessary to avoid caching the failed header
check result before we find libusb via pkg-config.
This commit is contained in:
Andrew Eikum 2019-07-31 11:34:00 -05:00
parent 1b7fc81e3f
commit e149f4c4b0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1128,7 +1128,9 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID)
endif() endif()
if(SDL_JOYSTICK) if(SDL_JOYSTICK)
CheckUSBHID() # seems to be BSD specific - limit the test to BSD only? if(FREEBSD OR NETBSD OR OPENBSD OR BSDI)
CheckUSBHID()
endif()
CheckHIDAPI() CheckHIDAPI()
if(LINUX AND NOT ANDROID) if(LINUX AND NOT ANDROID)
set(SDL_JOYSTICK_LINUX 1) set(SDL_JOYSTICK_LINUX 1)

2
cmake/sdlchecks.cmake
View File

@ -1074,7 +1074,7 @@ macro(CheckHIDAPI)
set(HAVE_HIDAPI FALSE) set(HAVE_HIDAPI FALSE)
pkg_check_modules(LIBUSB libusb) pkg_check_modules(LIBUSB libusb)
if (LIBUSB_FOUND) if (LIBUSB_FOUND)
check_include_file(libusb.h HAVE_LIBUSB_H) check_include_file(libusb.h HAVE_LIBUSB_H ${LIBUSB_CFLAGS})
if (HAVE_LIBUSB_H) if (HAVE_LIBUSB_H)
set(HAVE_HIDAPI TRUE) set(HAVE_HIDAPI TRUE)
endif() endif()