From 121504eeb3c7765fd24dc4adac888df151d2c61b Mon Sep 17 00:00:00 2001 From: Davide Gerhard Date: Fri, 19 Apr 2019 08:30:48 +0200 Subject: [PATCH] enable fcdpro/fcdproplus on macOS; remove asound dependency asound is not needed; now it uses qt audio --- plugins/samplesource/CMakeLists.txt | 4 ++-- plugins/samplesource/fcdpro/CMakeLists.txt | 1 - plugins/samplesource/fcdproplus/CMakeLists.txt | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/samplesource/CMakeLists.txt b/plugins/samplesource/CMakeLists.txt index 215a7089c..59bb80006 100644 --- a/plugins/samplesource/CMakeLists.txt +++ b/plugins/samplesource/CMakeLists.txt @@ -29,10 +29,10 @@ if(LIBUSB_FOUND AND LIBBLADERF_FOUND) add_subdirectory(bladerf2input) endif(LIBUSB_FOUND AND LIBBLADERF_FOUND) -if(LIBUSB_FOUND AND NOT APPLE) +if(LIBUSB_FOUND) add_subdirectory(fcdpro) add_subdirectory(fcdproplus) -endif(LIBUSB_FOUND AND NOT APPLE) +endif(LIBUSB_FOUND) find_package(LibHACKRF) if(LIBUSB_FOUND AND LIBHACKRF_FOUND) diff --git a/plugins/samplesource/fcdpro/CMakeLists.txt b/plugins/samplesource/fcdpro/CMakeLists.txt index a3270955f..bf6a758cc 100644 --- a/plugins/samplesource/fcdpro/CMakeLists.txt +++ b/plugins/samplesource/fcdpro/CMakeLists.txt @@ -46,7 +46,6 @@ add_library(inputfcdpro SHARED target_link_libraries(inputfcdpro ${QT_LIBRARIES} - asound fcdhid fcdlib sdrbase diff --git a/plugins/samplesource/fcdproplus/CMakeLists.txt b/plugins/samplesource/fcdproplus/CMakeLists.txt index 0b94f9658..c1a348138 100644 --- a/plugins/samplesource/fcdproplus/CMakeLists.txt +++ b/plugins/samplesource/fcdproplus/CMakeLists.txt @@ -25,7 +25,7 @@ set(fcdproplus_FORMS include_directories( . ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client + ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client ${CMAKE_SOURCE_DIR}/fcdhid ${CMAKE_SOURCE_DIR}/fcdlib ) @@ -46,7 +46,6 @@ add_library(inputfcdproplus SHARED target_link_libraries(inputfcdproplus ${QT_LIBRARIES} - asound fcdhid fcdlib sdrbase