VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-30 20:40:20 -04:00
Code Issues Projects Releases Wiki Activity

bump version to 4.8.0 and fix new plugins

Browse Source 
new cmake for:
- channeltx/localsource
- samplesink/localoutput
This commit is contained in:
Davide Gerhard 2019-05-11 12:20:57 +02:00
parent c9a95297d1
commit 32d9a73e44
No known key found for this signature in database
GPG Key ID: 7CBEFA144857DC97
4 changed files with 117 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -14,8 +14,8 @@ include(ExternalProject)
# configure version # configure version
set(sdrangel_VERSION_MAJOR "4") set(sdrangel_VERSION_MAJOR "4")
set(sdrangel_VERSION_MINOR "7") set(sdrangel_VERSION_MINOR "8")
set(sdrangel_VERSION_PATCH "1") set(sdrangel_VERSION_PATCH "0")
set(sdrangel_VERSION_SUFFIX "") set(sdrangel_VERSION_SUFFIX "")
# SDRAngel cmake options # SDRAngel cmake options

63
plugins/channeltx/localsource/CMakeLists.txt
View File

@ -1,11 +1,8 @@
project(localsource) project(localsource)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(localsource_SOURCES set(localsource_SOURCES
localsource.cpp localsource.cpp
localsourcethread.cpp localsourcethread.cpp
localsourcegui.cpp
localsourceplugin.cpp localsourceplugin.cpp
localsourcesettings.cpp localsourcesettings.cpp
) )
@ -13,40 +10,48 @@ set(localsource_SOURCES
set(localsource_HEADERS set(localsource_HEADERS
localsource.h localsource.h
localsourcethread.h localsourcethread.h
localsourcegui.h
localsourceplugin.h localsourceplugin.h
localsourcesettings.h localsourcesettings.h
) )
set(localsource_FORMS include_directories(
localsourcegui.ui
)
add_definitions(${QT_DEFINITIONS})
add_definitions(-DQT_PLUGIN)
add_definitions(-DQT_SHARED)
qt5_wrap_ui(localsource_FORMS_HEADERS ${localsource_FORMS})
add_library(localsource SHARED
${localsource_SOURCES}
${localsource_HEADERS_MOC}
${localsource_FORMS_HEADERS}
)
target_include_directories(localsource PUBLIC
.
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${Boost_INCLUDE_DIRS}
) )
target_link_libraries(localsource if(NOT SERVER_MODE)
${QT_LIBRARIES} set(localsource_SOURCES
${localsource_SOURCES}
localsourcegui.cpp
localsourcegui.ui
)
set(localsource_HEADERS
${localsource_HEADERS}
localsourcegui.h
)
set(TARGET_NAME localsource)
set(TARGET_LIB "Qt5::Widgets")
set(TARGET_LIB_GUI "sdrgui")
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
else()
set(TARGET_NAME localsourcesrv)
set(TARGET_LIB "")
set(TARGET_LIB_GUI "")
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
endif()
add_library(${TARGET_NAME} SHARED
${localsource_SOURCES}
)
target_link_libraries(${TARGET_NAME}
Qt5::Core
${TARGET_LIB}
sdrbase sdrbase
sdrgui ${TARGET_LIB_GUI}
swagger swagger
) )
target_link_libraries(localsource Qt5::Core Qt5::Widgets Qt5::Network) install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
install(TARGETS localsource DESTINATION lib/plugins/channeltx)

54
plugins/samplesink/localoutput/CMakeLists.txt
View File

@ -1,50 +1,54 @@
project(localoutput) project(localoutput)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(localoutput_SOURCES set(localoutput_SOURCES
localoutputgui.cpp
localoutput.cpp localoutput.cpp
localoutputplugin.cpp localoutputplugin.cpp
localoutputsettings.cpp localoutputsettings.cpp
) )
set(localoutput_HEADERS set(localoutput_HEADERS
localoutputgui.h
localoutput.h localoutput.h
localoutputplugin.h localoutputplugin.h
localoutputsettings.h localoutputsettings.h
) )
set(localoutput_FORMS
localoutputgui.ui
)
include_directories( include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
) )
add_definitions(${QT_DEFINITIONS}) if(NOT SERVER_MODE)
add_definitions(-DQT_PLUGIN) set(localoutput_SOURCES
add_definitions(-DQT_SHARED) ${localoutput_SOURCES}
localoutputgui.cpp
qt5_wrap_ui(localoutput_FORMS_HEADERS ${localoutput_FORMS})
localoutputgui.ui
add_library(outputlocal SHARED )
set(localoutput_HEADERS
${localoutput_HEADERS}
localoutputgui.h
)
set(TARGET_NAME outputlocal)
set(TARGET_LIB "Qt5::Widgets")
set(TARGET_LIB_GUI "sdrgui")
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
else()
set(TARGET_NAME outputlocalsrv)
set(TARGET_LIB "")
set(TARGET_LIB_GUI "")
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
endif()
add_library(${TARGET_NAME} SHARED
${localoutput_SOURCES} ${localoutput_SOURCES}
${localoutput_HEADERS_MOC}
${localoutput_FORMS_HEADERS}
) )
target_link_libraries(outputlocal target_link_libraries(${TARGET_NAME}
${QT_LIBRARIES} Qt5::Core
${TARGET_LIB}
sdrbase sdrbase
sdrgui ${TARGET_LIB_GUI}
swagger swagger
) )
target_link_libraries(outputlocal Qt5::Core Qt5::Widgets) install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})
install(TARGETS outputlocal DESTINATION lib/plugins/samplesink)

50
plugins/samplesink/localoutput/ccc.txt Normal file
View File

@ -0,0 +1,50 @@
project(localoutput)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(localoutput_SOURCES
localoutputgui.cpp
localoutput.cpp
localoutputplugin.cpp
localoutputsettings.cpp
)
set(localoutput_HEADERS
localoutputgui.h
localoutput.h
localoutputplugin.h
localoutputsettings.h
)
set(localoutput_FORMS
localoutputgui.ui
)
include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
)
add_definitions(${QT_DEFINITIONS})
add_definitions(-DQT_PLUGIN)
add_definitions(-DQT_SHARED)
qt5_wrap_ui(localoutput_FORMS_HEADERS ${localoutput_FORMS})
add_library(outputlocal SHARED
${localoutput_SOURCES}
${localoutput_HEADERS_MOC}
${localoutput_FORMS_HEADERS}
)
target_link_libraries(outputlocal
${QT_LIBRARIES}
sdrbase
sdrgui
swagger
)
target_link_libraries(outputlocal Qt5::Core Qt5::Widgets)
install(TARGETS outputlocal DESTINATION lib/plugins/samplesink)