From 7c1ff7c5ad9054ae93543b623d71583229cc0f26 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 16 Apr 2017 09:58:35 +0200 Subject: [PATCH] LimeSDR support: removed Debian specifics from the build as it will use LimeSuite as an external package --- devices/limesdr/CMakeLists.txt | 16 ---------------- .../samplesource/limesdrinput/CMakeLists.txt | 19 ------------------- 2 files changed, 35 deletions(-) diff --git a/devices/limesdr/CMakeLists.txt b/devices/limesdr/CMakeLists.txt index d502d93e6..6856b1e72 100644 --- a/devices/limesdr/CMakeLists.txt +++ b/devices/limesdr/CMakeLists.txt @@ -8,20 +8,11 @@ set(limesdrdevice_HEADERS devicelimesdrparam.h ) -if (BUILD_DEBIAN) -include_directories( - . - ${CMAKE_CURRENT_BINARY_DIR} - ${LIMESUITESRC}/include - ${LIMESUITESRC}/src -) -else (BUILD_DEBIAN) include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${LIMESUITE_INCLUDE_DIR} ) -endif (BUILD_DEBIAN) add_definitions(${QT_DEFINITIONS}) add_definitions(-DQT_SHARED) @@ -30,16 +21,9 @@ add_library(limesdrdevice SHARED ${limesdrdevice_SOURCES} ) -if (BUILD_DEBIAN) -target_link_libraries(limesdrdevice - limesuite - sdrbase -) -else (BUILD_DEBIAN) target_link_libraries(limesdrdevice ${LIMESUITE_LIBRARY} sdrbase ) -endif (BUILD_DEBIAN) install(TARGETS limesdrdevice DESTINATION lib) diff --git a/plugins/samplesource/limesdrinput/CMakeLists.txt b/plugins/samplesource/limesdrinput/CMakeLists.txt index ed234ab18..7103e8d8b 100644 --- a/plugins/samplesource/limesdrinput/CMakeLists.txt +++ b/plugins/samplesource/limesdrinput/CMakeLists.txt @@ -20,22 +20,12 @@ set(limesdrinput_FORMS limesdrinputgui.ui ) -if (BUILD_DEBIAN) -include_directories( - . - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/devices - ${LIBBLADERFLIBSRC}/include - ${LIBBLADERFLIBSRC}/src -) -else (BUILD_DEBIAN) include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/devices ${LIMESUITE_INCLUDE_DIR} ) -endif (BUILD_DEBIAN) #include(${QT_USE_FILE}) add_definitions(${QT_DEFINITIONS}) @@ -51,21 +41,12 @@ add_library(inputlimesdr SHARED ${limesdrinput_FORMS_HEADERS} ) -if (BUILD_DEBIAN) -target_link_libraries(inputlimesdr - ${QT_LIBRARIES} - limesdr - sdrbase - limesdrdevice -) -else (BUILD_DEBIAN) target_link_libraries(inputlimesdr ${QT_LIBRARIES} ${LIMESUITE_LIBRARY} sdrbase limesdrdevice ) -endif (BUILD_DEBIAN) qt5_use_modules(inputlimesdr Core Widgets)