From 758c8a1bb0592176086f91f2be4f513b6840660d Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 13 Apr 2021 04:22:00 +0200 Subject: [PATCH] Appveyor: Ubuntu build: SDRplay v3 is not an external library build. Use cmake/ci script instead to install in image --- .appveyor.yml | 2 +- external/CMakeLists.txt | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0c22d6f15..3922409b1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -97,7 +97,7 @@ for: - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_airspyhf.sh; fi - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_rtlsdr.sh; fi - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_limesuite.sh; fi - - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_sdrplay.sh; fi + - sh: bash cmake/ci/build_sdrplay.sh before_build: - sh: bash -c export - sh: bash -c pwd diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 0d1ca841d..7dd516463 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(SDRPLAY_TAG "3.07") set(PTHREADS4W_TAG "Version-2-11-0-release") set(RTLSDR_TAG be1d1206bfb6e6c41f7d91b20b77e20f929fa6a7) @@ -591,24 +590,6 @@ if (LINUX) ) endif (NOT LIBMIRISDR_FOUND OR LIBMIRISDR_EXTERNAL) - if (NOT SDRPLAY_FOUND OR SDRPLAY_EXTERNAL) - set(SDRPLAY_FOUND ON CACHE INTERNAL "") - set(SDRPLAY_EXTERNAL ON CACHE INTERNAL "") - set(SDRPLAY_INCLUDE_DIR "${EXTERNAL_BUILD_LIBRARIES}/sdrplayapi/src/sdrplayapi/inc" CACHE INTERNAL "") - set(SDRPLAY_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/sdrplayapi/src/sdrplayapi/x86_64/libsdrplay_api.so.3.07" CACHE INTERNAL "") - ExternalProject_Add(sdrplayapi - GIT_REPOSITORY https://github.com/srcejon/sdrplayapi.git - GIT_TAG ${SDRPLAY_TAG} - PREFIX "${EXTERNAL_BUILD_LIBRARIES}/sdrplayapi" - CMAKE_ARGS ${COMMON_CMAKE_ARGS} - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - BUILD_BYPRODUCTS "" - INSTALL_COMMAND "" - TEST_COMMAND "" - ) - endif (NOT SDRPLAY_FOUND OR SDRPLAY_EXTERNAL) - endif (LINUX) if (WIN32 OR APPLE)