1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 09:48:45 -05:00

enable fcdpro/fcdproplus on macOS; remove asound dependency

asound is not needed; now it uses qt audio
This commit is contained in:
Davide Gerhard 2019-04-19 08:30:48 +02:00
parent 0182364143
commit 121504eeb3
No known key found for this signature in database
GPG Key ID: 7CBEFA144857DC97
3 changed files with 3 additions and 5 deletions

View File

@ -29,10 +29,10 @@ if(LIBUSB_FOUND AND LIBBLADERF_FOUND)
add_subdirectory(bladerf2input) add_subdirectory(bladerf2input)
endif(LIBUSB_FOUND AND LIBBLADERF_FOUND) endif(LIBUSB_FOUND AND LIBBLADERF_FOUND)
if(LIBUSB_FOUND AND NOT APPLE) if(LIBUSB_FOUND)
add_subdirectory(fcdpro) add_subdirectory(fcdpro)
add_subdirectory(fcdproplus) add_subdirectory(fcdproplus)
endif(LIBUSB_FOUND AND NOT APPLE) endif(LIBUSB_FOUND)
find_package(LibHACKRF) find_package(LibHACKRF)
if(LIBUSB_FOUND AND LIBHACKRF_FOUND) if(LIBUSB_FOUND AND LIBHACKRF_FOUND)

View File

@ -46,7 +46,6 @@ add_library(inputfcdpro SHARED
target_link_libraries(inputfcdpro target_link_libraries(inputfcdpro
${QT_LIBRARIES} ${QT_LIBRARIES}
asound
fcdhid fcdhid
fcdlib fcdlib
sdrbase sdrbase

View File

@ -25,7 +25,7 @@ set(fcdproplus_FORMS
include_directories( include_directories(
. .
${CMAKE_CURRENT_BINARY_DIR} ${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}/fcdhid
${CMAKE_SOURCE_DIR}/fcdlib ${CMAKE_SOURCE_DIR}/fcdlib
) )
@ -46,7 +46,6 @@ add_library(inputfcdproplus SHARED
target_link_libraries(inputfcdproplus target_link_libraries(inputfcdproplus
${QT_LIBRARIES} ${QT_LIBRARIES}
asound
fcdhid fcdhid
fcdlib fcdlib
sdrbase sdrbase