diff --git a/debian/debhelper-build-stamp b/debian/debhelper-build-stamp deleted file mode 100644 index baa0b3599..000000000 --- a/debian/debhelper-build-stamp +++ /dev/null @@ -1,2 +0,0 @@ -sdrangel -sdrangel diff --git a/debian/rules b/debian/rules index 83c1e2b4f..8df0f0285 100755 --- a/debian/rules +++ b/debian/rules @@ -21,5 +21,4 @@ # dh_make generated override targets # This is example for Cmake (See https://bugs.debian.org/641051 ) override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/sdrangel -DBUILD_TYPE=DEBIAN -DLIBCM256CCSRC=/z1/development/cm256cc -DLIBDSDCCSRC=/z1/development/dsdcc -DLIBAIRSPYSRC=/z1/development/libairspy/libairspy -DLIBHACKRFSRC=/z1/development/hackrf/host/libhackrf -DLIBRTLSDRSRC=/z1/development/librtlsdr.f4exb -DLIBMBELIBSRC=/z1/development/mbelib -DLIBSERIALDVSRC=/z1/development/serialDV -# dh_auto_configure -- -Wno-dev -DCMAKE_INSTALL_PREFIX=/opt/sdrangel -DCM256CC_LIBRARIES=/opt/install/cm256cc/lib/libcm256cc.so -DCM256CC_INCLUDE_DIR=/opt/install/cm256cc/include/cm256cc + dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/opt/sdrangel -DBUILD_TYPE=DEBIAN -DLIBCM256CCSRC=/z1/development/cm256cc -DLIBDSDCCSRC=/z1/development/dsdcc -DLIBAIRSPYSRC=/z1/development/libairspy -DLIBHACKRFSRC=/z1/development/hackrf/host -DLIBRTLSDRSRC=/z1/development/librtlsdr.f4exb -DLIBMBELIBSRC=/z1/development/mbelib -DLIBSERIALDVSRC=/z1/development/serialDV diff --git a/libairspy/CMakeLists.txt b/libairspy/CMakeLists.txt index 5c5309be4..b0180d27e 100644 --- a/libairspy/CMakeLists.txt +++ b/libairspy/CMakeLists.txt @@ -3,24 +3,24 @@ project(airspy) find_package(LibUSB) set(airspy_SOURCES - ${LIBAIRSPYSRC}/src/airspy.c - ${LIBAIRSPYSRC}/src/iqconverter_float.c - ${LIBAIRSPYSRC}/src/iqconverter_int16.c + ${LIBAIRSPYSRC}/libairspy/src/airspy.c + ${LIBAIRSPYSRC}/libairspy/src/iqconverter_float.c + ${LIBAIRSPYSRC}/libairspy/src/iqconverter_int16.c ) set(airspy_HEADERS - ${LIBAIRSPYSRC}/src/airspy.h - ${LIBAIRSPYSRC}/src/airspy_commands.h - ${LIBAIRSPYSRC}/src/iqconverter_float.h - ${LIBAIRSPYSRC}/src/iqconverter_int16.h - ${LIBAIRSPYSRC}/src/filters.h + ${LIBAIRSPYSRC}/libairspy/src/airspy.h + ${LIBAIRSPYSRC}/libairspy/src/airspy_commands.h + ${LIBAIRSPYSRC}/libairspy/src/iqconverter_float.h + ${LIBAIRSPYSRC}/libairspy/src/iqconverter_int16.h + ${LIBAIRSPYSRC}/libairspy/src/filters.h ) include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${LIBUSB_INCLUDE_DIR} - ${LIBAIRSPYSRC}/src + ${LIBAIRSPYSRC}/libairspy/src ) add_definitions(-DQT_SHARED) diff --git a/libhackrf/CMakeLists.txt b/libhackrf/CMakeLists.txt index 468f32f6d..7afa12e96 100644 --- a/libhackrf/CMakeLists.txt +++ b/libhackrf/CMakeLists.txt @@ -3,18 +3,18 @@ project(hackrf) find_package(LibUSB) set(hackrf_SOURCES - ${LIBHACKRFSRC}/src/hackrf.c + ${LIBHACKRFSRC}/libhackrf/src/hackrf.c ) set(hackrf_HEADERS - ${LIBHACKRFSRC}/src/hackrf.h + ${LIBHACKRFSRC}/libhackrf/src/hackrf.h ) include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ${LIBUSB_INCLUDE_DIR} - ${LIBHACKRFSRC}/src + ${LIBHACKRFSRC}/libhackrf/src ) add_definitions(-DQT_SHARED) diff --git a/plugins/samplesource/CMakeLists.txt b/plugins/samplesource/CMakeLists.txt index b28828e8b..80d75dc73 100644 --- a/plugins/samplesource/CMakeLists.txt +++ b/plugins/samplesource/CMakeLists.txt @@ -3,43 +3,43 @@ project(samplesource) find_package(LibUSB) if(V4L-RTL) - FIND_LIBRARY (LIBV4L2 v4l2) - FIND_PATH (LIBV4L2H libv4l2.h) -# add_subdirectory(v4l-rtl) + FIND_LIBRARY (LIBV4L2 v4l2) + FIND_PATH (LIBV4L2H libv4l2.h) +# add_subdirectory(v4l-rtl) endif() if(V4L-MSI) FIND_LIBRARY (LIBV4L2 v4l2) - FIND_PATH (LIBV4L2H libv4l2.h) -# add_subdirectory(v4l-msi) + FIND_PATH (LIBV4L2H libv4l2.h) +# add_subdirectory(v4l-msi) endif() if(LIBUSB_FOUND AND UNIX) - FIND_PATH (ASOUNDH alsa/asoundlib.h) - FIND_LIBRARY (LIBASOUND asound) + FIND_PATH (ASOUNDH alsa/asoundlib.h) + FIND_LIBRARY (LIBASOUND asound) endif() if(LIBASOUND AND ASOUNDH) - add_subdirectory(fcdpro) - add_subdirectory(fcdproplus) + add_subdirectory(fcdpro) + add_subdirectory(fcdproplus) endif() find_package(LibRTLSDR) if(LIBUSB_FOUND AND LIBRTLSDR_FOUND) - add_subdirectory(rtlsdr) + add_subdirectory(rtlsdr) endif(LIBUSB_FOUND AND LIBRTLSDR_FOUND) find_package(LibBLADERF) if(LIBUSB_FOUND AND LIBBLADERF_FOUND) - add_subdirectory(bladerf) + add_subdirectory(bladerf) endif(LIBUSB_FOUND AND LIBBLADERF_FOUND) find_package(LibAIRSPY) if(LIBUSB_FOUND AND LIBAIRSPY_FOUND) - add_subdirectory(airspy) + add_subdirectory(airspy) endif(LIBUSB_FOUND AND LIBAIRSPY_FOUND) find_package(LibHACKRF) if(LIBUSB_FOUND AND LIBHACKRF_FOUND) - add_subdirectory(hackrf) + add_subdirectory(hackrf) endif(LIBUSB_FOUND AND LIBHACKRF_FOUND) #find_package(LibNANOMSG) @@ -52,6 +52,13 @@ if(CM256CC_FOUND) add_subdirectory(sdrdaemonfec) endif(CM256CC_FOUND) +if (BUILD_DEBIAN) + add_subdirectory(airspy) + add_subdirectory(hackrf) + add_subdirectory(rtlsdr) +endif (BUILD_DEBIAN) + + add_subdirectory(filesource) add_subdirectory(sdrdaemon) diff --git a/plugins/samplesource/airspy/CMakeLists.txt b/plugins/samplesource/airspy/CMakeLists.txt index 23aa03b63..a2f30e15a 100644 --- a/plugins/samplesource/airspy/CMakeLists.txt +++ b/plugins/samplesource/airspy/CMakeLists.txt @@ -24,7 +24,8 @@ if (BUILD_DEBIAN) include_directories( . ${CMAKE_CURRENT_BINARY_DIR} - ${LIBAIRSPYSRC}/src + ${LIBAIRSPYSRC} + ${LIBAIRSPYSRC}/libairspy/src ) else (BUILD_DEBIAN) include_directories( diff --git a/plugins/samplesource/hackrf/CMakeLists.txt b/plugins/samplesource/hackrf/CMakeLists.txt index 7df804706..7b3ac676e 100644 --- a/plugins/samplesource/hackrf/CMakeLists.txt +++ b/plugins/samplesource/hackrf/CMakeLists.txt @@ -24,7 +24,8 @@ if (BUILD_DEBIAN) include_directories( . ${CMAKE_CURRENT_BINARY_DIR} - ${LIBHACKRFSRC}/src + ${LIBHACKRFSRC} + ${LIBHACKRFSRC}/libhackrf/src ) else (BUILD_DEBIAN) include_directories( diff --git a/plugins/samplesource/sdrdaemonfec/CMakeLists.txt b/plugins/samplesource/sdrdaemonfec/CMakeLists.txt index e4d24105b..e515308d3 100644 --- a/plugins/samplesource/sdrdaemonfec/CMakeLists.txt +++ b/plugins/samplesource/sdrdaemonfec/CMakeLists.txt @@ -4,27 +4,22 @@ find_package(LibNANOMSG) set(sdrdaemonfec_SOURCES sdrdaemonfecbuffer.cpp - sdrdaemonfecgui.cpp - sdrdaemonfecinput.cpp - sdrdaemonfecplugin.cpp - sdrdaemonfecudphandler.cpp + sdrdaemonfecgui.cpp + sdrdaemonfecinput.cpp + sdrdaemonfecplugin.cpp + sdrdaemonfecudphandler.cpp ) set(sdrdaemonfec_HEADERS sdrdaemonfecbuffer.h - sdrdaemonfecgui.h - sdrdaemonfecinput.h - sdrdaemonfecplugin.h - sdrdaemonfecudphandler.h + sdrdaemonfecgui.h + sdrdaemonfecinput.h + sdrdaemonfecplugin.h + sdrdaemonfecudphandler.h ) set(sdrdaemonfec_FORMS - sdrdaemonfecgui.ui -) - -include_directories( - . - ${CMAKE_CURRENT_BINARY_DIR} + sdrdaemonfecgui.ui ) #include(${QT_USE_FILE}) @@ -36,22 +31,42 @@ add_definitions(-DQT_SHARED) qt5_wrap_ui(sdrdaemonfec_FORMS_HEADERS ${sdrdaemonfec_FORMS}) add_library(inputsdrdaemonfec SHARED - ${sdrdaemonfec_SOURCES} - ${sdrdaemonfec_HEADERS_MOC} - ${sdrdaemonfec_FORMS_HEADERS} + ${sdrdaemonfec_SOURCES} + ${sdrdaemonfec_HEADERS_MOC} + ${sdrdaemonfec_FORMS_HEADERS} ) +if (BUILD_DEBIAN) target_include_directories(inputsdrdaemonfec PUBLIC + . + ${CMAKE_CURRENT_BINARY_DIR} + ${LIBCM256CCSRC} + ${LIBNANOMSG_INCLUDE_DIR} +) +else (BUILD_DEBIAN) +target_include_directories(inputsdrdaemonfec PUBLIC + . + ${CMAKE_CURRENT_BINARY_DIR} ${CM256CC_INCLUDE_DIR} ${LIBNANOMSG_INCLUDE_DIR} ) +endif (BUILD_DEBIAN) +if (BUILD_DEBIAN) target_link_libraries(inputsdrdaemonfec - ${QT_LIBRARIES} - ${CM256CC_LIBRARIES} - ${LIBNANOMSG_LIBRARIES} - sdrbase + ${QT_LIBRARIES} + cm256cc + ${LIBNANOMSG_LIBRARIES} + sdrbase ) +else (BUILD_DEBIAN) +target_link_libraries(inputsdrdaemonfec + ${QT_LIBRARIES} + ${CM256CC_LIBRARIES} + ${LIBNANOMSG_LIBRARIES} + sdrbase +) +endif (BUILD_DEBIAN) qt5_use_modules(inputsdrdaemonfec Core Widgets OpenGL Multimedia)