From ec3e62e9a42027a1b201e60c0a324a0a65ef649c Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 6 Oct 2020 00:05:17 +0200 Subject: [PATCH] Try to use libuhd-dev for Linux Appveyor build --- .appveyor.yml | 2 +- debian/control | 4 +--- external/CMakeLists.txt | 32 -------------------------------- 3 files changed, 2 insertions(+), 36 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 95ec9baf0..f6b8ba94e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -70,7 +70,7 @@ for: 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 \ 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 \ autoconf automake libtool - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_cm256cc.sh; fi diff --git a/debian/control b/debian/control index 2659cfbe0..0e76fd28a 100644 --- a/debian/control +++ b/debian/control @@ -27,9 +27,7 @@ Build-Depends: debhelper (>= 9), libopus-dev, libairspy-dev, libhackrf-dev, - python3-mako, - python3-cheetah, - python3-numpy + libuhd-dev # TODO: # - more dependencies based on version; newer has more devices # - manage dependencies not present upstream diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 3fac0b1b3..275b5d88b 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -19,7 +19,6 @@ set(LIBIIO_TAG 826563e41b5ce9890b75506f672017de8d76d52d) set(AIRSPYHF_TAG "1.1.5") set(PERSEUS_TAG afefa23e3140ac79d845acb68cf0beeb86d09028) set(MIRISDR_TAG "v1.1.2") -set(UHD_TAG "v4.0.0.0") set(PTHREADS4W_TAG "Version-2-11-0-release") set(RTLSDR_TAG be1d1206bfb6e6c41f7d91b20b77e20f929fa6a7) @@ -465,37 +464,6 @@ if (LINUX) set(LIBMIRISDR_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libmirisdr.so" CACHE INTERNAL "") 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) if (WIN32 OR APPLE)