VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 17:28:50 -05:00
Code Issues Projects Releases Wiki Activity

Appveyor: Ubuntu build: SDRplay v3 is not an external library build. Use cmake/ci script instead to install in image

Browse Source
This commit is contained in:
f4exb 2021-04-13 04:22:00 +02:00
parent 5c780980d2
commit 758c8a1bb0
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -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_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_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_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: before_build:
- sh: bash -c export - sh: bash -c export
- sh: bash -c pwd - sh: bash -c pwd

19
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(SDRPLAY_TAG "3.07")
set(PTHREADS4W_TAG "Version-2-11-0-release") set(PTHREADS4W_TAG "Version-2-11-0-release")
set(RTLSDR_TAG be1d1206bfb6e6c41f7d91b20b77e20f929fa6a7) set(RTLSDR_TAG be1d1206bfb6e6c41f7d91b20b77e20f929fa6a7)
@ -591,24 +590,6 @@ if (LINUX)
) )
endif (NOT LIBMIRISDR_FOUND OR LIBMIRISDR_EXTERNAL) 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) endif (LINUX)
if (WIN32 OR APPLE) if (WIN32 OR APPLE)