diff --git a/plugins/samplesource/CMakeLists.txt b/plugins/samplesource/CMakeLists.txt index 416713107..d4698339d 100644 --- a/plugins/samplesource/CMakeLists.txt +++ b/plugins/samplesource/CMakeLists.txt @@ -25,7 +25,7 @@ endif(LIBUSB_FOUND AND LIBAIRSPYHF_FOUND) find_package(LibBLADERF) if(LIBUSB_FOUND AND LIBBLADERF_FOUND) - add_subdirectory(bladerfinput) + add_subdirectory(bladerf1input) endif(LIBUSB_FOUND AND LIBBLADERF_FOUND) if(LIBUSB_FOUND AND UNIX) @@ -79,7 +79,7 @@ endif(LIBUSB_FOUND AND LIBMIRISDR_FOUND) if (BUILD_DEBIAN) add_subdirectory(airspy) add_subdirectory(airspyhf) - add_subdirectory(bladerfinput) + add_subdirectory(bladerf1input) add_subdirectory(hackrfinput) add_subdirectory(limesdrinput) add_subdirectory(perseus) diff --git a/plugins/samplesource/bladerfinput/CMakeLists.txt b/plugins/samplesource/bladerf1input/CMakeLists.txt similarity index 59% rename from plugins/samplesource/bladerfinput/CMakeLists.txt rename to plugins/samplesource/bladerf1input/CMakeLists.txt index 86eedc0f4..7297d64a3 100644 --- a/plugins/samplesource/bladerfinput/CMakeLists.txt +++ b/plugins/samplesource/bladerf1input/CMakeLists.txt @@ -1,8 +1,8 @@ -project(bladerfinput) +project(bladerf1input) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -set(bladerfinput_SOURCES +set(bladerf1input_SOURCES bladerf1inputgui.cpp bladerf1input.cpp bladerf1inputplugin.cpp @@ -10,7 +10,7 @@ set(bladerfinput_SOURCES bladerf1inputthread.cpp ) -set(bladerfinput_HEADERS +set(bladerf1input_HEADERS bladerf1inputgui.h bladerf1input.h bladerf1inputplugin.h @@ -18,7 +18,7 @@ set(bladerfinput_HEADERS bladerf1inputthread.h ) -set(bladerfinput_FORMS +set(bladerf1input_FORMS bladerf1inputgui.ui ) @@ -26,7 +26,7 @@ if (BUILD_DEBIAN) 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}/devices ${LIBBLADERFLIBSRC}/include ${LIBBLADERFLIBSRC}/src @@ -35,7 +35,7 @@ else (BUILD_DEBIAN) 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}/devices ${LIBBLADERF_INCLUDE_DIR} ) @@ -46,17 +46,17 @@ add_definitions(${QT_DEFINITIONS}) add_definitions(-DQT_PLUGIN) add_definitions(-DQT_SHARED) -#qt4_wrap_cpp(bladerfinput_HEADERS_MOC ${bladerfinput_HEADERS}) -qt5_wrap_ui(bladerfinput_FORMS_HEADERS ${bladerfinput_FORMS}) +#qt4_wrap_cpp(bladerf1input_HEADERS_MOC ${bladerf1input_HEADERS}) +qt5_wrap_ui(bladerf1input_FORMS_HEADERS ${bladerf1input_FORMS}) -add_library(inputbladerf SHARED - ${bladerfinput_SOURCES} - ${bladerfinput_HEADERS_MOC} - ${bladerfinput_FORMS_HEADERS} +add_library(inputbladerf1 SHARED + ${bladerf1input_SOURCES} + ${bladerf1input_HEADERS_MOC} + ${bladerf1input_FORMS_HEADERS} ) if (BUILD_DEBIAN) -target_link_libraries(inputbladerf +target_link_libraries(inputbladerf1 ${QT_LIBRARIES} bladerf sdrbase @@ -65,7 +65,7 @@ target_link_libraries(inputbladerf bladerf1device ) else (BUILD_DEBIAN) -target_link_libraries(inputbladerf +target_link_libraries(inputbladerf1 ${QT_LIBRARIES} ${LIBBLADERF_LIBRARIES} sdrbase @@ -75,6 +75,6 @@ target_link_libraries(inputbladerf ) 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) diff --git a/plugins/samplesource/bladerfinput/bladerf1input.cpp b/plugins/samplesource/bladerf1input/bladerf1input.cpp similarity index 100% rename from plugins/samplesource/bladerfinput/bladerf1input.cpp rename to plugins/samplesource/bladerf1input/bladerf1input.cpp diff --git a/plugins/samplesource/bladerfinput/bladerf1input.h b/plugins/samplesource/bladerf1input/bladerf1input.h similarity index 100% rename from plugins/samplesource/bladerfinput/bladerf1input.h rename to plugins/samplesource/bladerf1input/bladerf1input.h diff --git a/plugins/samplesource/bladerfinput/bladerf1inputgui.cpp b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp similarity index 100% rename from plugins/samplesource/bladerfinput/bladerf1inputgui.cpp rename to plugins/samplesource/bladerf1input/bladerf1inputgui.cpp diff --git a/plugins/samplesource/bladerfinput/bladerf1inputgui.h b/plugins/samplesource/bladerf1input/bladerf1inputgui.h similarity index 100% rename from plugins/samplesource/bladerfinput/bladerf1inputgui.h rename to plugins/samplesource/bladerf1input/bladerf1inputgui.h diff --git a/plugins/samplesource/bladerfinput/bladerf1inputgui.ui b/plugins/samplesource/bladerf1input/bladerf1inputgui.ui similarity index 100% rename from plugins/samplesource/bladerfinput/bladerf1inputgui.ui rename to plugins/samplesource/bladerf1input/bladerf1inputgui.ui diff --git a/plugins/samplesource/bladerfinput/bladerf1inputplugin.cpp b/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp similarity index 100% rename from plugins/samplesource/bladerfinput/bladerf1inputplugin.cpp rename to plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp diff --git a/plugins/samplesource/bladerfinput/bladerf1inputplugin.h b/plugins/samplesource/bladerf1input/bladerf1inputplugin.h similarity index 100% rename from plugins/samplesource/bladerfinput/bladerf1inputplugin.h rename to plugins/samplesource/bladerf1input/bladerf1inputplugin.h diff --git a/plugins/samplesource/bladerfinput/bladerf1inputsettings.cpp b/plugins/samplesource/bladerf1input/bladerf1inputsettings.cpp similarity index 100% rename from plugins/samplesource/bladerfinput/bladerf1inputsettings.cpp rename to plugins/samplesource/bladerf1input/bladerf1inputsettings.cpp diff --git a/plugins/samplesource/bladerfinput/bladerf1inputsettings.h b/plugins/samplesource/bladerf1input/bladerf1inputsettings.h similarity index 100% rename from plugins/samplesource/bladerfinput/bladerf1inputsettings.h rename to plugins/samplesource/bladerf1input/bladerf1inputsettings.h diff --git a/plugins/samplesource/bladerfinput/bladerf1inputthread.cpp b/plugins/samplesource/bladerf1input/bladerf1inputthread.cpp similarity index 100% rename from plugins/samplesource/bladerfinput/bladerf1inputthread.cpp rename to plugins/samplesource/bladerf1input/bladerf1inputthread.cpp diff --git a/plugins/samplesource/bladerfinput/bladerf1inputthread.h b/plugins/samplesource/bladerf1input/bladerf1inputthread.h similarity index 100% rename from plugins/samplesource/bladerfinput/bladerf1inputthread.h rename to plugins/samplesource/bladerf1input/bladerf1inputthread.h diff --git a/plugins/samplesource/bladerfinput/bladerfinput.pro b/plugins/samplesource/bladerf1input/bladerfinput.pro similarity index 100% rename from plugins/samplesource/bladerfinput/bladerfinput.pro rename to plugins/samplesource/bladerf1input/bladerfinput.pro diff --git a/plugins/samplesource/bladerfinput/readme.md b/plugins/samplesource/bladerf1input/readme.md similarity index 100% rename from plugins/samplesource/bladerfinput/readme.md rename to plugins/samplesource/bladerf1input/readme.md diff --git a/pluginssrv/samplesource/CMakeLists.txt b/pluginssrv/samplesource/CMakeLists.txt index 5761f7480..231856323 100644 --- a/pluginssrv/samplesource/CMakeLists.txt +++ b/pluginssrv/samplesource/CMakeLists.txt @@ -25,7 +25,7 @@ endif(LIBUSB_FOUND AND LIBAIRSPYHF_FOUND) find_package(LibBLADERF) if(LIBUSB_FOUND AND LIBBLADERF_FOUND) - add_subdirectory(bladerfinput) + add_subdirectory(bladerf1input) endif(LIBUSB_FOUND AND LIBBLADERF_FOUND) if(LIBUSB_FOUND AND UNIX) @@ -79,6 +79,7 @@ endif(LIBUSB_FOUND AND LIBMIRISDR_FOUND) if (BUILD_DEBIAN) add_subdirectory(airspy) add_subdirectory(airspyhf) + add_subdirectory(bladerf1input) add_subdirectory(hackrfinput) add_subdirectory(limesdrinput) add_subdirectory(perseus) diff --git a/pluginssrv/samplesource/bladerfinput/CMakeLists.txt b/pluginssrv/samplesource/bladerf1input/CMakeLists.txt similarity index 65% rename from pluginssrv/samplesource/bladerfinput/CMakeLists.txt rename to pluginssrv/samplesource/bladerf1input/CMakeLists.txt index afc501449..eb73f4553 100644 --- a/pluginssrv/samplesource/bladerfinput/CMakeLists.txt +++ b/pluginssrv/samplesource/bladerf1input/CMakeLists.txt @@ -1,16 +1,16 @@ -project(bladerfinput) +project(bladerf1input) 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}/bladerf1inputplugin.cpp ${PLUGIN_PREFIX}/bladerf1inputsettings.cpp ${PLUGIN_PREFIX}/bladerf1inputthread.cpp ) -set(bladerfinput_HEADERS +set(bladerf1input_HEADERS ${PLUGIN_PREFIX}/bladerf1input.h ${PLUGIN_PREFIX}/bladerf1inputplugin.h ${PLUGIN_PREFIX}/bladerf1inputsettings.h @@ -21,7 +21,7 @@ if (BUILD_DEBIAN) 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}/devices ${LIBBLADERFLIBSRC}/include ${LIBBLADERFLIBSRC}/src @@ -30,7 +30,7 @@ else (BUILD_DEBIAN) 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}/devices ${LIBBLADERF_INCLUDE_DIR} ) @@ -40,13 +40,13 @@ add_definitions(${QT_DEFINITIONS}) add_definitions(-DQT_PLUGIN) add_definitions(-DQT_SHARED) -add_library(inputbladerfsrv SHARED - ${bladerfinput_SOURCES} - ${bladerfinput_HEADERS_MOC} +add_library(inputbladerf1srv SHARED + ${bladerf1input_SOURCES} + ${bladerf1input_HEADERS_MOC} ) if (BUILD_DEBIAN) -target_link_libraries(inputbladerfsrv +target_link_libraries(inputbladerf1srv ${QT_LIBRARIES} bladerf sdrbase @@ -54,7 +54,7 @@ target_link_libraries(inputbladerfsrv bladerf1device ) else (BUILD_DEBIAN) -target_link_libraries(inputbladerfsrv +target_link_libraries(inputbladerf1srv ${QT_LIBRARIES} ${LIBBLADERF_LIBRARIES} sdrbase @@ -63,6 +63,6 @@ target_link_libraries(inputbladerfsrv ) 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)