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

Fixed bug 5221 - libusb isn't detected correctly in CMake 

Sven-Hendrik Haase

In CMake I currently have trouble activating hidapi support as libusb-1.0 isn't ever correctly detected as it's searched for by the wrong name.

configure.ac correctly does this:

PKG_CHECK_MODULES([LIBUSB], [libusb-1.0], have_libusb=yes, have_libusb=no)

However, sdlchecks.cmake does this:

pkg_check_modules(LIBUSB libusb)

but it needs to be:

pkg_check_modules(LIBUSB libusb-1.0)
This commit is contained in:
Sam Lantinga 2020-12-09 07:26:59 -08:00
parent 7fa5e95b62
commit bd032c1f72
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/sdlchecks.cmake
View File

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