From 8f0205c5516a2d316661e03717a9de752a4f93f2 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Fri, 27 May 2022 12:27:01 +0100
Subject: [PATCH] Fix hidapi for mac

---
 CMakeLists.txt          | 3 +--
 external/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32ee35ff3..c9afd5942 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -398,6 +398,7 @@ else()
     find_package(Sgp4)
     find_package(AptDec)
     find_package(LibDAB)
+    find_package(HIDAPI)
 endif()
 
 if (LIBSIGMF_FOUND AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@@ -448,8 +449,6 @@ if(ENABLE_USRP)
   find_package(UHD)
 endif()
 
-find_package(HIDAPI)
-
 if(ENABLE_FUNCUBE AND UNIX AND LIBUSB_FOUND AND HIDAPI_FOUND)
     add_subdirectory(fcdlib)
     add_subdirectory(fcdhid)
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 46c5e0267..07cdbff27 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -252,7 +252,7 @@ if (NOT HIDAPI_FOUND AND NOT USE_PRECOMPILED_LIBS)
     set(HIDAPI_FOUND ON CACHE INTERNAL "")
     set(HIDAPI_EXTERNAL ON CACHE INTERNAL "")
     set(HIDAPI_ROOT_DIR "${install_dir}" CACHE INTERNAL "")
-    set(HIDAPI_INCLUDE_DIRS "${install_dir}/include" CACHE INTERNAL "")
+    set(HIDAPI_INCLUDE_DIRS "${install_dir}/include/hidapi" CACHE INTERNAL "")
     if (APPLE)
         set(HIDAPI_LIBRARIES "${install_dir}/lib/libhidapi${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
         set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${install_dir}/lib")