mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-12-26 10:58:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed cmake bug and added ubuntu bionic

Browse Source
This commit is contained in:
Ryzerth 2021-04-26 15:12:52 +02:00
parent 061cb91c48
commit 1ba3756be0
25 changed files with 83 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/build_linux_amd64.yml → .github/workflows/build_all.yml vendored
View File

@ -96,6 +96,28 @@ jobs:
name: sdrpp_debian_bullseye_amd64 name: sdrpp_debian_bullseye_amd64
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
build_ubuntu_bionic:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Create Docker Image
run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_bionic && docker build . --tag sdrpp_build
- name: Run Container
run: docker run --name build sdrpp_build /root/do_build.sh
- name: Recover Deb Archive
working-directory: ${{runner.workspace}}
run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
- name: Save Deb Archive
uses: actions/upload-artifact@v2
with:
name: sdrpp_ubuntu_bionic_amd64
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
build_ubuntu_focal: build_ubuntu_focal:
runs-on: ubuntu-latest runs-on: ubuntu-latest

2
CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(sdrpp) project(sdrpp)
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

4
airspy_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(airspy_source) project(airspy_source)
if (MSVC) if (MSVC)
@ -19,7 +19,7 @@ set_target_properties(airspy_source PROPERTIES PREFIX "")
if (MSVC) if (MSVC)
# Lib path # Lib path
target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/bin/") target_link_directories(airspy_source PUBLIC "C:/Program Files/PothosSDR/bin/")
target_link_libraries(airspy_source PUBLIC airspy) target_link_libraries(airspy_source PUBLIC airspy)
else (MSVC) else (MSVC)

4
airspyhf_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(airspyhf_source) project(airspyhf_source)
if (MSVC) if (MSVC)
@ -19,7 +19,7 @@ set_target_properties(airspyhf_source PROPERTIES PREFIX "")
if (MSVC) if (MSVC)
# Lib path # Lib path
target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/bin/") target_link_directories(airspyhf_source PUBLIC "C:/Program Files/PothosSDR/bin/")
target_link_libraries(airspyhf_source PUBLIC airspyhf) target_link_libraries(airspyhf_source PUBLIC airspyhf)
else (MSVC) else (MSVC)

14
audio_sink/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(audio_sink) project(audio_sink)
if (MSVC) if (MSVC)
@ -19,22 +19,22 @@ set_target_properties(audio_sink PROPERTIES PREFIX "")
if (MSVC) if (MSVC)
# Lib path # Lib path
target_link_directories(sdrpp_core PUBLIC "C:/Program Files (x86)/RtAudio/lib") target_link_directories(audio_sink PUBLIC "C:/Program Files (x86)/RtAudio/lib")
# Misc headers # Misc headers
target_include_directories(sdrpp_core PUBLIC "C:/Program Files (x86)/RtAudio/include/rtaudio") target_include_directories(audio_sink PUBLIC "C:/Program Files (x86)/RtAudio/include/rtaudio")
target_link_libraries(sdrpp_core PUBLIC rtaudio) target_link_libraries(audio_sink PUBLIC rtaudio)
else (MSVC) else (MSVC)
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(RTAUDIO REQUIRED rtaudio) pkg_check_modules(RTAUDIO REQUIRED rtaudio)
target_include_directories(sdrpp_core PUBLIC ${RTAUDIO_INCLUDE_DIRS}) target_include_directories(audio_sink PUBLIC ${RTAUDIO_INCLUDE_DIRS})
target_link_directories(sdrpp_core PUBLIC ${RTAUDIO_LIBRARY_DIRS}) target_link_directories(audio_sink PUBLIC ${RTAUDIO_LIBRARY_DIRS})
target_link_libraries(sdrpp_core PUBLIC ${RTAUDIO_LIBRARIES}) target_link_libraries(audio_sink PUBLIC ${RTAUDIO_LIBRARIES})
endif () endif ()

4
bladerf_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(bladerf_source) project(bladerf_source)
if (MSVC) if (MSVC)
@ -19,7 +19,7 @@ set_target_properties(bladerf_source PROPERTIES PREFIX "")
if (MSVC) if (MSVC)
# Lib path # Lib path
target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/bin/") target_link_directories(bladerf_source PUBLIC "C:/Program Files/PothosSDR/bin/")
target_link_libraries(bladerf_source PUBLIC bladeRF) target_link_libraries(bladerf_source PUBLIC bladeRF)
else (MSVC) else (MSVC)

2
core/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(sdrpp_core) project(sdrpp_core)
# Set compiler options # Set compiler options

2
demo_module/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(demo) project(demo)
if (MSVC) if (MSVC)

2
discord_integration/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(discord_integration) project(discord_integration)
if (MSVC) if (MSVC)

4
docker_builds/ubuntu_bionic/Dockerfile Normal file
View File

@ -0,0 +1,4 @@
FROM ubuntu:bionic
ENV DEBIAN_FRONTEND=noninteractive
COPY do_build.sh /root
RUN chmod +x /root/do_build.sh

18
docker_builds/ubuntu_bionic/do_build.sh Normal file
View File

@ -0,0 +1,18 @@
#!/bin/bash
set -e
cd /root
apt update
apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk1-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev
git clone https://github.com/AlexandreRouma/SDRPlusPlus
cd SDRPlusPlus
mkdir build
cd build
cmake ..
make -j2
cd ..
sh make_debian_package.sh ./build

2
falcon9_decoder/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(falcon9_decoder) project(falcon9_decoder)
if (MSVC) if (MSVC)

2
file_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(file_source) project(file_source)
if (MSVC) if (MSVC)

4
hackrf_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(hackrf_source) project(hackrf_source)
if (MSVC) if (MSVC)
@ -19,7 +19,7 @@ set_target_properties(hackrf_source PROPERTIES PREFIX "")
if (MSVC) if (MSVC)
# Lib path # Lib path
target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/bin/") target_link_directories(hackrf_source PUBLIC "C:/Program Files/PothosSDR/bin/")
target_link_libraries(hackrf_source PUBLIC hackrf) target_link_libraries(hackrf_source PUBLIC hackrf)
else (MSVC) else (MSVC)

2
meteor_demodulator/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(meteor_demodulator) project(meteor_demodulator)
if (MSVC) if (MSVC)

6
plutosdr_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(plutosdr_source) project(plutosdr_source)
if (MSVC) if (MSVC)
@ -19,8 +19,8 @@ set_target_properties(plutosdr_source PROPERTIES PREFIX "")
if (MSVC) if (MSVC)
# Lib path # Lib path
target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/lib/") target_link_directories(plutosdr_source PUBLIC "C:/Program Files/PothosSDR/lib/")
target_include_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/include/") target_include_directories(plutosdr_source PUBLIC "C:/Program Files/PothosSDR/include/")
target_link_libraries(plutosdr_source PUBLIC libiio) target_link_libraries(plutosdr_source PUBLIC libiio)
target_link_libraries(plutosdr_source PUBLIC libad9361) target_link_libraries(plutosdr_source PUBLIC libad9361)

2
radio/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(radio) project(radio)
if (MSVC) if (MSVC)

2
recorder/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(recorder) project(recorder)
if (MSVC) if (MSVC)

4
rtl_sdr_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(rtl_sdr_source) project(rtl_sdr_source)
if (MSVC) if (MSVC)
@ -19,7 +19,7 @@ set_target_properties(rtl_sdr_source PROPERTIES PREFIX "")
if (MSVC) if (MSVC)
# Lib path # Lib path
target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/bin/") target_link_directories(rtl_sdr_source PUBLIC "C:/Program Files/PothosSDR/bin/")
target_link_libraries(rtl_sdr_source PUBLIC rtlsdr) target_link_libraries(rtl_sdr_source PUBLIC rtlsdr)
else (MSVC) else (MSVC)

2
rtl_tcp_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(rtl_tcp_source) project(rtl_tcp_source)
if (MSVC) if (MSVC)

2
rx888_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(rx888_source) project(rx888_source)
if (MSVC) if (MSVC)

4
sdrplay_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(sdrplay_source) project(sdrplay_source)
if (MSVC) if (MSVC)
@ -19,7 +19,7 @@ set_target_properties(sdrplay_source PROPERTIES PREFIX "")
if (MSVC) if (MSVC)
# Lib path # Lib path
target_link_directories(sdrpp_core PUBLIC "C:/Program Files/SDRplay/API/x64") target_link_directories(sdrplay_source PUBLIC "C:/Program Files/SDRplay/API/x64")
target_include_directories(sdrplay_source PUBLIC "C:/Program Files/SDRplay/API/inc") target_include_directories(sdrplay_source PUBLIC "C:/Program Files/SDRplay/API/inc")
target_link_libraries(sdrplay_source PUBLIC sdrplay_api) target_link_libraries(sdrplay_source PUBLIC sdrplay_api)

8
soapy_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(soapy_source) project(soapy_source)
if (MSVC) if (MSVC)
@ -17,12 +17,12 @@ set_target_properties(soapy_source PROPERTIES PREFIX "")
if (MSVC) if (MSVC)
# Lib path # Lib path
target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/lib/") target_link_directories(soapy_source PUBLIC "C:/Program Files/PothosSDR/lib/")
# Misc headers # Misc headers
target_include_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/include/") target_include_directories(soapy_source PUBLIC "C:/Program Files/PothosSDR/include/")
target_link_libraries(sdrpp_core PUBLIC SoapySDR) target_link_libraries(soapy_source PUBLIC SoapySDR)
else (MSVC) else (MSVC)
find_package(PkgConfig) find_package(PkgConfig)

2
spyserver_source/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(spyserver_source) project(spyserver_source)
if (MSVC) if (MSVC)

2
weather_sat_decoder/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.10)
project(weather_sat_decoder) project(weather_sat_decoder)
if (MSVC) if (MSVC)