From 8970c1a7931c86fc5ff870082152c41d8c722683 Mon Sep 17 00:00:00 2001 From: Vlad Firoiu Date: Tue, 28 Feb 2017 16:16:47 -0800 Subject: [PATCH] Don't use hidapi-hidraw without udev. --- CMakeLists.txt | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2547e5c220..a2a6d1d051 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -754,15 +754,22 @@ if(NOT ANDROID) include_directories(${HIDAPI_INCLUDE_DIRS}) list(APPEND LIBS ${HIDAPI_LIBRARIES}) else() + set(HIDAPI_FOUND 1) include_directories(Externals/hidapi/hidapi) if(APPLE) message(STATUS "Using static hidapi from Externals") add_subdirectory(Externals/hidapi/mac) list(APPEND LIBS hidapi) elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - message(STATUS "Using static hidapi-hidraw from Externals") - add_subdirectory(Externals/hidapi/linux) - list(APPEND LIBS hidapi-hidraw udev) + find_package(Libudev) + if(LIBUDEV_FOUND) + message(STATUS "Using static hidapi-hidraw from Externals") + add_subdirectory(Externals/hidapi/linux) + list(APPEND LIBS hidapi-hidraw udev) + else() + message(STATUS "Could not find udev, disabling hidapi") + set(HIDAPI_FOUND 0) + endif() elseif(MSVC) message(STATUS "Using static hidapi-hid from Externals") add_subdirectory(Externals/hidapi/windows) @@ -773,8 +780,9 @@ if(NOT ANDROID) list(APPEND LIBS hidapi-libusb) endif() endif() - set(HIDAPI_FOUND 1) - add_definitions(-DHAVE_HIDAPI=1) + if(HIDAPI_FOUND) + add_definitions(-DHAVE_HIDAPI=1) + endif() endif() if(NOT DISABLE_WX)