From f86afff3e8ae66a737a371cc272dde905d0911ed Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 16 Sep 2018 01:30:43 +0200 Subject: [PATCH] Fixed Debian build --- plugins/channelrx/daemonsink/CMakeLists.txt | 45 +++++++++++++------ plugins/channeltx/CMakeLists.txt | 5 +++ plugins/channeltx/daemonsource/CMakeLists.txt | 45 +++++++++++++------ .../sdrdaemonsink/sdrdaemonsinkgui.h | 1 - 4 files changed, 69 insertions(+), 27 deletions(-) diff --git a/plugins/channelrx/daemonsink/CMakeLists.txt b/plugins/channelrx/daemonsink/CMakeLists.txt index 3375cb799..9b7d04c38 100644 --- a/plugins/channelrx/daemonsink/CMakeLists.txt +++ b/plugins/channelrx/daemonsink/CMakeLists.txt @@ -22,13 +22,6 @@ set(daemonsink_FORMS daemonsinkgui.ui ) -include_directories( - . - ${CMAKE_CURRENT_BINARY_DIR} - ${CM256CC_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client -) - #include(${QT_USE_FILE}) add_definitions(${QT_DEFINITIONS}) add_definitions(-DQT_PLUGIN) @@ -42,13 +35,39 @@ add_library(daemonsink SHARED ${daemonsink_FORMS_HEADERS} ) -target_link_libraries(daemonsink - ${QT_LIBRARIES} - ${CM256CC_LIBRARIES} - sdrbase - sdrgui - swagger +if (BUILD_DEBIAN) +target_include_directories(daemonsink PUBLIC + . + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client + ${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) diff --git a/plugins/channeltx/CMakeLists.txt b/plugins/channeltx/CMakeLists.txt index 3b24dfce0..7c4977aef 100644 --- a/plugins/channeltx/CMakeLists.txt +++ b/plugins/channeltx/CMakeLists.txt @@ -15,3 +15,8 @@ find_package(OpenCV) if (OpenCV_FOUND) add_subdirectory(modatv) endif() + +if (BUILD_DEBIAN) + add_subdirectory(daemonsource) +endif (BUILD_DEBIAN) + diff --git a/plugins/channeltx/daemonsource/CMakeLists.txt b/plugins/channeltx/daemonsource/CMakeLists.txt index 8caf6ef74..682f1953a 100644 --- a/plugins/channeltx/daemonsource/CMakeLists.txt +++ b/plugins/channeltx/daemonsource/CMakeLists.txt @@ -22,13 +22,6 @@ set(daemonsource_FORMS daemonsourcegui.ui ) -include_directories( - . - ${CMAKE_CURRENT_BINARY_DIR} - ${CM256CC_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client -) - #include(${QT_USE_FILE}) add_definitions(${QT_DEFINITIONS}) add_definitions(-DQT_PLUGIN) @@ -42,13 +35,39 @@ add_library(daemonsource SHARED ${daemonsource_FORMS_HEADERS} ) -target_link_libraries(daemonsource - ${QT_LIBRARIES} - ${CM256CC_LIBRARIES} - sdrbase - sdrgui - swagger +if (BUILD_DEBIAN) +target_include_directories(daemonsource PUBLIC + . + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client + ${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) diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h index 186a012f6..314be9314 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h @@ -137,7 +137,6 @@ private: private slots: void handleInputMessages(); - void on_centerFrequency_changed(quint64 value); void on_sampleRate_changed(quint64 value); void on_txDelay_valueChanged(int value); void on_nbFECBlocks_valueChanged(int value);