mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-29 01:48:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FindHIDAPI: Actually fix the underlying issue.

Browse source
This commit is contained in:
Ryan Pavlik 2020-03-03 14:56:22 -06:00
parent 2ded61258c
commit 7db8a153a6
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cmake/FindHIDAPI.cmake
View file

@ -52,20 +52,20 @@
set(HIDAPI_ROOT_DIR "${HIDAPI_ROOT_DIR}" CACHE PATH "Root to search for HIDAPI") set(HIDAPI_ROOT_DIR "${HIDAPI_ROOT_DIR}" CACHE PATH "Root to search for HIDAPI")
# Clean up components # Clean up components
if("${HIDAPI_FIND_COMPONENTS}") if(HIDAPI_FIND_COMPONENTS)
if(WIN32 OR APPLE) if(WIN32 OR APPLE)
# This makes no sense on Windows or Mac, which have native APIs # This makes no sense on Windows or Mac, which have native APIs
list(REMOVE "${HIDAPI_FIND_COMPONENTS}" libusb) list(REMOVE HIDAPI_FIND_COMPONENTS libusb)
endif() endif()
if(NOT ${CMAKE_SYSTEM} MATCHES "Linux") if(NOT ${CMAKE_SYSTEM} MATCHES "Linux")
# hidraw is only on linux # hidraw is only on linux
list(REMOVE "${HIDAPI_FIND_COMPONENTS}" hidraw) list(REMOVE HIDAPI_FIND_COMPONENTS hidraw)
endif() endif()
endif() endif()
if(NOT "${HIDAPI_FIND_COMPONENTS}") if(NOT HIDAPI_FIND_COMPONENTS)
# Default to any # Default to any
set("${HIDAPI_FIND_COMPONENTS}" any) set(HIDAPI_FIND_COMPONENTS any)
endif() endif()
# Ask pkg-config for hints # Ask pkg-config for hints
@ -148,7 +148,6 @@ endif()
# Determine if the various requested components are found. # Determine if the various requested components are found.
### ###
set(_hidapi_component_required_vars) set(_hidapi_component_required_vars)
foreach(_comp IN LISTS HIDAPI_FIND_COMPONENTS) foreach(_comp IN LISTS HIDAPI_FIND_COMPONENTS)
if("${_comp}" STREQUAL "any") if("${_comp}" STREQUAL "any")
list(APPEND _hidapi_component_required_vars list(APPEND _hidapi_component_required_vars
@ -192,11 +191,9 @@ unset(_comp)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(HIDAPI find_package_handle_standard_args(HIDAPI
REQUIRED_VARS REQUIRED_VARS
HIDAPI_INCLUDE_DIR
${_hidapi_component_required_vars} ${_hidapi_component_required_vars}
THREADS_FOUND THREADS_FOUND
HANDLE_COMPONENTS) HANDLE_COMPONENTS)
if(HIDAPI_FOUND) if(HIDAPI_FOUND)
set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARY}") set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARY}")
set(HIDAPI_INCLUDE_DIRS "${HIDAPI_INCLUDE_DIR}") set(HIDAPI_INCLUDE_DIRS "${HIDAPI_INCLUDE_DIR}")