Merge pull request #173 from dominicgs/cmake_libusb
Fix discovery of libusb 1.0 for FreeBSD
This commit is contained in:
@ -24,10 +24,15 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
|
|||||||
pkg_check_modules(PC_LIBUSB libusb-1.0)
|
pkg_check_modules(PC_LIBUSB libusb-1.0)
|
||||||
ENDIF(NOT WIN32)
|
ENDIF(NOT WIN32)
|
||||||
|
|
||||||
|
set(LIBUSB_LIBRARY_NAME usb-1.0)
|
||||||
|
IF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
||||||
|
set(LIBUSB_LIBRARY_NAME usb)
|
||||||
|
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
||||||
|
|
||||||
FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h
|
FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h
|
||||||
PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})
|
PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})
|
||||||
|
|
||||||
FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0
|
FIND_LIBRARY(LIBUSB_LIBRARIES NAMES ${LIBUSB_LIBRARY_NAME}
|
||||||
PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
|
PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS})
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
include(FindPackageHandleStandardArgs)
|
||||||
|
Reference in New Issue
Block a user