VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 01:55:48 -05:00
Code Issues Projects Releases Wiki Activity

Try to use libuhd-dev for Linux Appveyor build

Browse Source
This commit is contained in:
f4exb 2020-10-06 00:05:17 +02:00
parent d0300ef76f
commit ec3e62e9a4
3 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -70,7 +70,7 @@ for:
libusb-1.0-0-dev libboost-all-dev libasound2-dev libopencv-dev libopencv-imgcodecs-dev \ libusb-1.0-0-dev libboost-all-dev libasound2-dev libopencv-dev libopencv-imgcodecs-dev \
libxml2-dev bison flex ffmpeg libpostproc-dev libavcodec-dev libavformat-dev \ libxml2-dev bison flex ffmpeg libpostproc-dev libavcodec-dev libavformat-dev \
libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \ libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \
libbladerf-dev libsoapysdr-dev libiio-dev \ libbladerf-dev libsoapysdr-dev libiio-dev libuhd-dev \
python3-mako python3-cheetah python3-numpy \ python3-mako python3-cheetah python3-numpy \
autoconf automake libtool autoconf automake libtool
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_cm256cc.sh; fi - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_cm256cc.sh; fi

4
debian/control vendored
View File

@ -27,9 +27,7 @@ Build-Depends: debhelper (>= 9),
libopus-dev, libopus-dev,
libairspy-dev, libairspy-dev,
libhackrf-dev, libhackrf-dev,
python3-mako, libuhd-dev
python3-cheetah,
python3-numpy
# TODO: # TODO:
# - more dependencies based on version; newer has more devices # - more dependencies based on version; newer has more devices
# - manage dependencies not present upstream # - manage dependencies not present upstream

32
external/CMakeLists.txt vendored
View File

@ -19,7 +19,6 @@ set(LIBIIO_TAG 826563e41b5ce9890b75506f672017de8d76d52d)
set(AIRSPYHF_TAG "1.1.5") set(AIRSPYHF_TAG "1.1.5")
set(PERSEUS_TAG afefa23e3140ac79d845acb68cf0beeb86d09028) set(PERSEUS_TAG afefa23e3140ac79d845acb68cf0beeb86d09028)
set(MIRISDR_TAG "v1.1.2") set(MIRISDR_TAG "v1.1.2")
set(UHD_TAG "v4.0.0.0")
set(PTHREADS4W_TAG "Version-2-11-0-release") set(PTHREADS4W_TAG "Version-2-11-0-release")
set(RTLSDR_TAG be1d1206bfb6e6c41f7d91b20b77e20f929fa6a7) set(RTLSDR_TAG be1d1206bfb6e6c41f7d91b20b77e20f929fa6a7)
@ -465,37 +464,6 @@ if (LINUX)
set(LIBMIRISDR_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libmirisdr.so" CACHE INTERNAL "") set(LIBMIRISDR_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libmirisdr.so" CACHE INTERNAL "")
endif (NOT LIBMIRISDR_FOUND OR LIBMIRISDR_EXTERNAL) endif (NOT LIBMIRISDR_FOUND OR LIBMIRISDR_EXTERNAL)
# needs boost and libusb
if (NOT UHD_FOUND OR UHD_EXTERNAL)
ExternalProject_Add(uhd
GIT_REPOSITORY https://github.com/EttusResearch/uhd.git
GIT_TAG ${UHD_TAG}
PREFIX "${EXTERNAL_BUILD_LIBRARIES}/uhd"
CMAKE_ARGS ${DEFAULT_OUTPUT_DIRECTORIES}
-DENABLE_PYTHON_API=OFF
-DENABLE_EXAMPLES=OFF
-DENABLE_UTILS=OFF
-DENABLE_TESTS=OFF
-DENABLE_B100=OFF
-DENABLE_USRP1=OFF
-DENABLE_X300=OFF
-DENABLE_MPMD=OFF
-DENABLE_N300=OFF
-DENABLE_N320=OFF
-DENABLE_E320=OFF
-DENABLE_E300=OFF
-DENABLE_OCTOCLOCK=OFF
-DENABLE_DPDK=OFF
SOURCE_SUBDIR host
INSTALL_COMMAND ""
TEST_COMMAND ""
)
set(UHD_FOUND ON CACHE INTERNAL "")
set(UHD_EXTERNAL ON CACHE INTERNAL "")
set(UHD_INCLUDE_DIR "${EXTERNAL_BUILD_LIBRARIES}/uhd/src/uhd/host/include" CACHE INTERNAL "")
set(UHD_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libuhd.so" CACHE INTERNAL "")
endif (NOT UHD_FOUND OR UHD_EXTERNAL)
endif (LINUX) endif (LINUX)
if (WIN32 OR APPLE) if (WIN32 OR APPLE)