VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-12 22:43:36 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
f4exb
2019-04-21 20:34:59 +02:00
parent 4731bd7324 c17062bfb2
commit 1f8f8e4286
5 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/CMakeLists.txt
+2 -2
View File
@@ -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)
plugins/samplesource/fcdpro/CMakeLists.txt
-1
View File
@@ -46,7 +46,6 @@ add_library(inputfcdpro SHARED
target_link_libraries(inputfcdpro
${QT_LIBRARIES}
asound
fcdhid
fcdlib
sdrbase
plugins/samplesource/fcdproplus/CMakeLists.txt
+1 -2
View File
@@ -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