1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 09:18:54 -05:00

Fix hidapi for mac

This commit is contained in:
Jon Beniston 2022-05-27 12:27:01 +01:00
parent 9c65d41839
commit 8f0205c551
2 changed files with 2 additions and 3 deletions

View File

@ -398,6 +398,7 @@ else()
find_package(Sgp4) find_package(Sgp4)
find_package(AptDec) find_package(AptDec)
find_package(LibDAB) find_package(LibDAB)
find_package(HIDAPI)
endif() endif()
if (LIBSIGMF_FOUND AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if (LIBSIGMF_FOUND AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@ -448,8 +449,6 @@ if(ENABLE_USRP)
find_package(UHD) find_package(UHD)
endif() endif()
find_package(HIDAPI)
if(ENABLE_FUNCUBE AND UNIX AND LIBUSB_FOUND AND HIDAPI_FOUND) if(ENABLE_FUNCUBE AND UNIX AND LIBUSB_FOUND AND HIDAPI_FOUND)
add_subdirectory(fcdlib) add_subdirectory(fcdlib)
add_subdirectory(fcdhid) add_subdirectory(fcdhid)

View File

@ -252,7 +252,7 @@ if (NOT HIDAPI_FOUND AND NOT USE_PRECOMPILED_LIBS)
set(HIDAPI_FOUND ON CACHE INTERNAL "") set(HIDAPI_FOUND ON CACHE INTERNAL "")
set(HIDAPI_EXTERNAL ON CACHE INTERNAL "") set(HIDAPI_EXTERNAL ON CACHE INTERNAL "")
set(HIDAPI_ROOT_DIR "${install_dir}" 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) if (APPLE)
set(HIDAPI_LIBRARIES "${install_dir}/lib/libhidapi${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") 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") set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${install_dir}/lib")