diff --git a/Readme.md b/Readme.md index d094e0bac..7feabe017 100644 --- a/Readme.md +++ b/Readme.md @@ -167,10 +167,16 @@ If you are not comfortable with this just do not install DSDcc and/or mbelib and - For Linux distributions: `plugins/channel/libdemoddsd.so` - For Windows distribution: `dsdcc.dll`, `mbelib.dll`, `plugins\channel\demoddsd.dll` -

Software distributions

+

Binary distributions

-In the [releases](https://github.com/f4exb/sdrangel/releases) section one can find binary distributions for Windows +In the [releases](https://github.com/f4exb/sdrangel/releases) section of the Github repository one can find binary distributions for Ubuntu and Windows -This is the archive of the complete binary distribution that expands to the `sdrangel` directory. You can install it anywhere you like and click on `sdrangel.exe` to start. +

Ubuntu

+ +The `.deb` file is a Debian package that can be installed with `sudo apt-get install` command. Occasionnally you may have to force the installation of dependencies with the `sudo apt-get install -f` command. + +

Windows

+ +The `.7z` file is a [7Zip](https://www.7-zip.org/) archive of the complete binary distribution that expands to the `sdrangel` directory. You can install it anywhere you like and double click on `sdrangel.exe` to start. ⚠ Windows distribution is provided as a by product thanks to the Qt toolchain. The platform of choice to run SDRangel is definitely Linux and very little support can be given for this Windows distribution. diff --git a/devices/perseus/CMakeLists.txt b/devices/perseus/CMakeLists.txt index 1cf08b9ce..1858709d7 100644 --- a/devices/perseus/CMakeLists.txt +++ b/devices/perseus/CMakeLists.txt @@ -19,6 +19,10 @@ add_library(perseusdevice SHARED ${perseusdevice_SOURCES} ) +if(ENABLE_EXTERNAL_LIBRARIES) + add_dependencies(perseusdevice perseus) +endif() + set_target_properties(perseusdevice PROPERTIES DEFINE_SYMBOL "devices_EXPORTS") diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index d2d4d296f..984be330d 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -17,6 +17,7 @@ set(LIMESUITE_TAG "v19.01.0") set(BLADERF_TAG 896d2431b3a35a4b31b6e729386202ebf5fdc5c0) set(LIBIIO_TAG 826563e41b5ce9890b75506f672017de8d76d52d) set(AIRSPYHF_TAG "1.1.5") +set(PERSEUS_TAG afefa23e3140ac79d845acb68cf0beeb86d09028) # For some external project macros @@ -245,19 +246,24 @@ if (LINUX) set(LIBAIRSPYHF_INCLUDE_DIR "${source_dir}/.." CACHE INTERNAL "") set(LIBAIRSPYHF_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libairspyhf.so" CACHE INTERNAL "") makeLink("${source_dir}/libairspyhf/src" "${source_dir}/../libairspyhf" airspyhf) + + # needs pkgconfig, libusb, autoconf, automake and libtool + ExternalProject_Add(perseus + GIT_REPOSITORY https://github.com/f4exb/libperseus-sdr.git + GIT_TAG ${PERSEUS_TAG} + PREFIX "${EXTERNAL_BUILD_LIBRARIES}/perseus" + CMAKE_ARGS ${DEFAULT_OUTPUT_DIRECTORY} + INSTALL_COMMAND "" + TEST_COMMAND "" + ) + set(LIBPERSEUS_FOUND ON CACHE INTERNAL "") + set(LIBPERSEUS_INCLUDE_DIR "${EXTERNAL_BUILD_LIBRARIES}/perseus/src/perseus" CACHE INTERNAL "") + set(LIBPERSEUS_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libperseus-sdr.so" CACHE INTERNAL "") endif() # already on the respository # TODO decide what to do if(OFF) -# needs pkgconfig, libusb, autoconf, automake and libtool -ExternalProject_Add(perseus - GIT_REPOSITORY https://github.com/f4exb/libperseus-sdr.git - GIT_TAG afefa23e3140ac79d845acb68cf0beeb86d09028 - PREFIX "${EXTERNAL_BUILD_LIBRARIES}/perseus" - INSTALL_COMMAND "" - TEST_COMMAND "" -) # apt install libcodec2-dev # needs speexdsp ExternalProject_Add(codec2 diff --git a/plugins/samplesource/perseus/CMakeLists.txt b/plugins/samplesource/perseus/CMakeLists.txt index a11cc1d73..931d1cdfa 100644 --- a/plugins/samplesource/perseus/CMakeLists.txt +++ b/plugins/samplesource/perseus/CMakeLists.txt @@ -48,6 +48,10 @@ add_library(${TARGET_NAME} SHARED ${perseus_SOURCES} ) +if(ENABLE_EXTERNAL_LIBRARIES) + add_dependencies(${TARGET_NAME} perseus) +endif() + target_link_libraries(${TARGET_NAME} Qt5::Core ${TARGET_LIB}