VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 21:01:45 -05:00
Code Issues Projects Releases Wiki Activity

LibbladeRF2: migrate bladerfinput to bladerf1input (2)

Browse Source
This commit is contained in:
f4exb 2018-09-19 13:28:14 +02:00
parent 9c5c2de56c
commit 5b31982772
17 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/samplesource/CMakeLists.txt
View File

@ -25,7 +25,7 @@ endif(LIBUSB_FOUND AND LIBAIRSPYHF_FOUND)
find_package(LibBLADERF) find_package(LibBLADERF)
if(LIBUSB_FOUND AND LIBBLADERF_FOUND) if(LIBUSB_FOUND AND LIBBLADERF_FOUND)
add_subdirectory(bladerfinput) add_subdirectory(bladerf1input)
endif(LIBUSB_FOUND AND LIBBLADERF_FOUND) endif(LIBUSB_FOUND AND LIBBLADERF_FOUND)
if(LIBUSB_FOUND AND UNIX) if(LIBUSB_FOUND AND UNIX)
@ -79,7 +79,7 @@ endif(LIBUSB_FOUND AND LIBMIRISDR_FOUND)
if (BUILD_DEBIAN) if (BUILD_DEBIAN)
add_subdirectory(airspy) add_subdirectory(airspy)
add_subdirectory(airspyhf) add_subdirectory(airspyhf)
add_subdirectory(bladerfinput) add_subdirectory(bladerf1input)
add_subdirectory(hackrfinput) add_subdirectory(hackrfinput)
add_subdirectory(limesdrinput) add_subdirectory(limesdrinput)
add_subdirectory(perseus) add_subdirectory(perseus)

28
plugins/samplesource/bladerfinput/CMakeLists.txt → plugins/samplesource/bladerf1input/CMakeLists.txt
View File

@ -1,8 +1,8 @@
project(bladerfinput) project(bladerf1input)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(bladerfinput_SOURCES set(bladerf1input_SOURCES
bladerf1inputgui.cpp bladerf1inputgui.cpp
bladerf1input.cpp bladerf1input.cpp
bladerf1inputplugin.cpp bladerf1inputplugin.cpp
@ -10,7 +10,7 @@ set(bladerfinput_SOURCES
bladerf1inputthread.cpp bladerf1inputthread.cpp
) )
set(bladerfinput_HEADERS set(bladerf1input_HEADERS
bladerf1inputgui.h bladerf1inputgui.h
bladerf1input.h bladerf1input.h
bladerf1inputplugin.h bladerf1inputplugin.h
@ -18,7 +18,7 @@ set(bladerfinput_HEADERS
bladerf1inputthread.h bladerf1inputthread.h
) )
set(bladerfinput_FORMS set(bladerf1input_FORMS
bladerf1inputgui.ui bladerf1inputgui.ui
) )
@ -46,17 +46,17 @@ add_definitions(${QT_DEFINITIONS})
add_definitions(-DQT_PLUGIN) add_definitions(-DQT_PLUGIN)
add_definitions(-DQT_SHARED) add_definitions(-DQT_SHARED)
#qt4_wrap_cpp(bladerfinput_HEADERS_MOC ${bladerfinput_HEADERS}) #qt4_wrap_cpp(bladerf1input_HEADERS_MOC ${bladerf1input_HEADERS})
qt5_wrap_ui(bladerfinput_FORMS_HEADERS ${bladerfinput_FORMS}) qt5_wrap_ui(bladerf1input_FORMS_HEADERS ${bladerf1input_FORMS})
add_library(inputbladerf SHARED add_library(inputbladerf1 SHARED
${bladerfinput_SOURCES} ${bladerf1input_SOURCES}
${bladerfinput_HEADERS_MOC} ${bladerf1input_HEADERS_MOC}
${bladerfinput_FORMS_HEADERS} ${bladerf1input_FORMS_HEADERS}
) )
if (BUILD_DEBIAN) if (BUILD_DEBIAN)
target_link_libraries(inputbladerf target_link_libraries(inputbladerf1
${QT_LIBRARIES} ${QT_LIBRARIES}
bladerf bladerf
sdrbase sdrbase
@ -65,7 +65,7 @@ target_link_libraries(inputbladerf
bladerf1device bladerf1device
) )
else (BUILD_DEBIAN) else (BUILD_DEBIAN)
target_link_libraries(inputbladerf target_link_libraries(inputbladerf1
${QT_LIBRARIES} ${QT_LIBRARIES}
${LIBBLADERF_LIBRARIES} ${LIBBLADERF_LIBRARIES}
sdrbase sdrbase
@ -75,6 +75,6 @@ target_link_libraries(inputbladerf
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
target_link_libraries(inputbladerf Qt5::Core Qt5::Widgets) target_link_libraries(inputbladerf1 Qt5::Core Qt5::Widgets)
install(TARGETS inputbladerf DESTINATION lib/plugins/samplesource) install(TARGETS inputbladerf1 DESTINATION lib/plugins/samplesource)

0
plugins/samplesource/bladerfinput/bladerf1input.cpp → plugins/samplesource/bladerf1input/bladerf1input.cpp
View File

0
plugins/samplesource/bladerfinput/bladerf1input.h → plugins/samplesource/bladerf1input/bladerf1input.h
View File

0
plugins/samplesource/bladerfinput/bladerf1inputgui.cpp → plugins/samplesource/bladerf1input/bladerf1inputgui.cpp
View File

0
plugins/samplesource/bladerfinput/bladerf1inputgui.h → plugins/samplesource/bladerf1input/bladerf1inputgui.h
View File

0
plugins/samplesource/bladerfinput/bladerf1inputgui.ui → plugins/samplesource/bladerf1input/bladerf1inputgui.ui
View File

0
plugins/samplesource/bladerfinput/bladerf1inputplugin.cpp → plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp
View File

0
plugins/samplesource/bladerfinput/bladerf1inputplugin.h → plugins/samplesource/bladerf1input/bladerf1inputplugin.h
View File

0
plugins/samplesource/bladerfinput/bladerf1inputsettings.cpp → plugins/samplesource/bladerf1input/bladerf1inputsettings.cpp
View File

0
plugins/samplesource/bladerfinput/bladerf1inputsettings.h → plugins/samplesource/bladerf1input/bladerf1inputsettings.h
View File

0
plugins/samplesource/bladerfinput/bladerf1inputthread.cpp → plugins/samplesource/bladerf1input/bladerf1inputthread.cpp
View File

0
plugins/samplesource/bladerfinput/bladerf1inputthread.h → plugins/samplesource/bladerf1input/bladerf1inputthread.h
View File

0
plugins/samplesource/bladerfinput/bladerfinput.pro → plugins/samplesource/bladerf1input/bladerfinput.pro
View File

0
plugins/samplesource/bladerfinput/readme.md → plugins/samplesource/bladerf1input/readme.md
View File

3
pluginssrv/samplesource/CMakeLists.txt
View File

@ -25,7 +25,7 @@ endif(LIBUSB_FOUND AND LIBAIRSPYHF_FOUND)
find_package(LibBLADERF) find_package(LibBLADERF)
if(LIBUSB_FOUND AND LIBBLADERF_FOUND) if(LIBUSB_FOUND AND LIBBLADERF_FOUND)
add_subdirectory(bladerfinput) add_subdirectory(bladerf1input)
endif(LIBUSB_FOUND AND LIBBLADERF_FOUND) endif(LIBUSB_FOUND AND LIBBLADERF_FOUND)
if(LIBUSB_FOUND AND UNIX) if(LIBUSB_FOUND AND UNIX)
@ -79,6 +79,7 @@ endif(LIBUSB_FOUND AND LIBMIRISDR_FOUND)
if (BUILD_DEBIAN) if (BUILD_DEBIAN)
add_subdirectory(airspy) add_subdirectory(airspy)
add_subdirectory(airspyhf) add_subdirectory(airspyhf)
add_subdirectory(bladerf1input)
add_subdirectory(hackrfinput) add_subdirectory(hackrfinput)
add_subdirectory(limesdrinput) add_subdirectory(limesdrinput)
add_subdirectory(perseus) add_subdirectory(perseus)

22
pluginssrv/samplesource/bladerfinput/CMakeLists.txt → pluginssrv/samplesource/bladerf1input/CMakeLists.txt
View File

@ -1,16 +1,16 @@
project(bladerfinput) project(bladerf1input)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(PLUGIN_PREFIX "../../../plugins/samplesource/bladerfinput") set(PLUGIN_PREFIX "../../../plugins/samplesource/bladerf1input")
set(bladerfinput_SOURCES set(bladerf1input_SOURCES
${PLUGIN_PREFIX}/bladerf1input.cpp ${PLUGIN_PREFIX}/bladerf1input.cpp
${PLUGIN_PREFIX}/bladerf1inputplugin.cpp ${PLUGIN_PREFIX}/bladerf1inputplugin.cpp
${PLUGIN_PREFIX}/bladerf1inputsettings.cpp ${PLUGIN_PREFIX}/bladerf1inputsettings.cpp
${PLUGIN_PREFIX}/bladerf1inputthread.cpp ${PLUGIN_PREFIX}/bladerf1inputthread.cpp
) )
set(bladerfinput_HEADERS set(bladerf1input_HEADERS
${PLUGIN_PREFIX}/bladerf1input.h ${PLUGIN_PREFIX}/bladerf1input.h
${PLUGIN_PREFIX}/bladerf1inputplugin.h ${PLUGIN_PREFIX}/bladerf1inputplugin.h
${PLUGIN_PREFIX}/bladerf1inputsettings.h ${PLUGIN_PREFIX}/bladerf1inputsettings.h
@ -40,13 +40,13 @@ add_definitions(${QT_DEFINITIONS})
add_definitions(-DQT_PLUGIN) add_definitions(-DQT_PLUGIN)
add_definitions(-DQT_SHARED) add_definitions(-DQT_SHARED)
add_library(inputbladerfsrv SHARED add_library(inputbladerf1srv SHARED
${bladerfinput_SOURCES} ${bladerf1input_SOURCES}
${bladerfinput_HEADERS_MOC} ${bladerf1input_HEADERS_MOC}
) )
if (BUILD_DEBIAN) if (BUILD_DEBIAN)
target_link_libraries(inputbladerfsrv target_link_libraries(inputbladerf1srv
${QT_LIBRARIES} ${QT_LIBRARIES}
bladerf bladerf
sdrbase sdrbase
@ -54,7 +54,7 @@ target_link_libraries(inputbladerfsrv
bladerf1device bladerf1device
) )
else (BUILD_DEBIAN) else (BUILD_DEBIAN)
target_link_libraries(inputbladerfsrv target_link_libraries(inputbladerf1srv
${QT_LIBRARIES} ${QT_LIBRARIES}
${LIBBLADERF_LIBRARIES} ${LIBBLADERF_LIBRARIES}
sdrbase sdrbase
@ -63,6 +63,6 @@ target_link_libraries(inputbladerfsrv
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
target_link_libraries(inputbladerfsrv Qt5::Core) target_link_libraries(inputbladerf1srv Qt5::Core)
install(TARGETS inputbladerfsrv DESTINATION lib/pluginssrv/samplesource) install(TARGETS inputbladerf1srv DESTINATION lib/pluginssrv/samplesource)