VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-24 19:22:27 -04:00
Code Issues Projects Releases Wiki Activity

Fixed Debian build

Browse Source
This commit is contained in:
f4exb 2018-09-16 01:30:43 +02:00
parent f3253ffccc
commit f86afff3e8
4 changed files with 69 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/channelrx/daemonsink/CMakeLists.txt
View File

@ -22,13 +22,6 @@ set(daemonsink_FORMS
daemonsinkgui.ui daemonsinkgui.ui
) )
include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${CM256CC_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
)
#include(${QT_USE_FILE}) #include(${QT_USE_FILE})
add_definitions(${QT_DEFINITIONS}) add_definitions(${QT_DEFINITIONS})
add_definitions(-DQT_PLUGIN) add_definitions(-DQT_PLUGIN)
@ -42,13 +35,39 @@ add_library(daemonsink SHARED
${daemonsink_FORMS_HEADERS} ${daemonsink_FORMS_HEADERS}
) )
target_link_libraries(daemonsink if (BUILD_DEBIAN)
${QT_LIBRARIES} target_include_directories(daemonsink PUBLIC
${CM256CC_LIBRARIES} .
sdrbase ${CMAKE_CURRENT_BINARY_DIR}
sdrgui ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
swagger ${LIBCM256CCSRC}
) )
else (BUILD_DEBIAN)
target_include_directories(daemonsink PUBLIC
.
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CM256CC_INCLUDE_DIR}
)
endif (BUILD_DEBIAN)
if (BUILD_DEBIAN)
target_link_libraries(daemonsink
${QT_LIBRARIES}
cm256cc
sdrbase
sdrgui
swagger
)
else (BUILD_DEBIAN)
target_link_libraries(daemonsink
${QT_LIBRARIES}
${CM256CC_LIBRARIES}
sdrbase
sdrgui
swagger
)
endif (BUILD_DEBIAN)
target_link_libraries(daemonsink Qt5::Core Qt5::Widgets) target_link_libraries(daemonsink Qt5::Core Qt5::Widgets)

5
plugins/channeltx/CMakeLists.txt
View File

@ -15,3 +15,8 @@ find_package(OpenCV)
if (OpenCV_FOUND) if (OpenCV_FOUND)
add_subdirectory(modatv) add_subdirectory(modatv)
endif() endif()
if (BUILD_DEBIAN)
add_subdirectory(daemonsource)
endif (BUILD_DEBIAN)

45
plugins/channeltx/daemonsource/CMakeLists.txt
View File

@ -22,13 +22,6 @@ set(daemonsource_FORMS
daemonsourcegui.ui daemonsourcegui.ui
) )
include_directories(
.
${CMAKE_CURRENT_BINARY_DIR}
${CM256CC_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
)
#include(${QT_USE_FILE}) #include(${QT_USE_FILE})
add_definitions(${QT_DEFINITIONS}) add_definitions(${QT_DEFINITIONS})
add_definitions(-DQT_PLUGIN) add_definitions(-DQT_PLUGIN)
@ -42,13 +35,39 @@ add_library(daemonsource SHARED
${daemonsource_FORMS_HEADERS} ${daemonsource_FORMS_HEADERS}
) )
target_link_libraries(daemonsource if (BUILD_DEBIAN)
${QT_LIBRARIES} target_include_directories(daemonsource PUBLIC
${CM256CC_LIBRARIES} .
sdrbase ${CMAKE_CURRENT_BINARY_DIR}
sdrgui ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
swagger ${LIBCM256CCSRC}
) )
else (BUILD_DEBIAN)
target_include_directories(daemonsource PUBLIC
.
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
${CM256CC_INCLUDE_DIR}
)
endif (BUILD_DEBIAN)
if (BUILD_DEBIAN)
target_link_libraries(daemonsource
${QT_LIBRARIES}
cm256cc
sdrbase
sdrgui
swagger
)
else (BUILD_DEBIAN)
target_link_libraries(daemonsource
${QT_LIBRARIES}
${CM256CC_LIBRARIES}
sdrbase
sdrgui
swagger
)
endif (BUILD_DEBIAN)
target_link_libraries(daemonsource Qt5::Core Qt5::Widgets Qt5::Network) target_link_libraries(daemonsource Qt5::Core Qt5::Widgets Qt5::Network)

1
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h
View File

@ -137,7 +137,6 @@ private:
private slots: private slots:
void handleInputMessages(); void handleInputMessages();
void on_centerFrequency_changed(quint64 value);
void on_sampleRate_changed(quint64 value); void on_sampleRate_changed(quint64 value);
void on_txDelay_valueChanged(int value); void on_txDelay_valueChanged(int value);
void on_nbFECBlocks_valueChanged(int value); void on_nbFECBlocks_valueChanged(int value);