Browse Source

Merge branch 'psk31' of https://github.com/srcejon/sdrangel into psk31

chirpmodem-v8.0.0
Jon Beniston 2 months ago
parent
commit
acf88bbacd
  1. 2
      CMakeLists.txt
  2. 4
      external/CMakeLists.txt

2
CMakeLists.txt

@ -992,6 +992,8 @@ elseif(ENABLE_EXTERNAL_LIBRARIES STREQUAL "AUTO") @@ -992,6 +992,8 @@ elseif(ENABLE_EXTERNAL_LIBRARIES STREQUAL "AUTO")
if(NOT ANDROID)
find_package(LibUSB)
endif()
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND ENABLE_EXTERNAL_LIBRARIES STREQUAL "ON")
find_package(FFTW3F)
endif()
if (NOT ENABLE_EXTERNAL_LIBRARIES OR (ENABLE_EXTERNAL_LIBRARIES STREQUAL "AUTO"))

4
external/CMakeLists.txt vendored

@ -900,7 +900,7 @@ if(ENABLE_FEATURE_STARTRACKER) @@ -900,7 +900,7 @@ if(ENABLE_FEATURE_STARTRACKER)
# ${EXTERNAL_BUILD_LIBRARIES}/cspice/src/cspice-build/lib/libcspice.so
# so point CSPICE_LIBRARIES there.
set(CSPICE_LIBRARIES
"${EXTERNAL_BUILD_LIBRARIES}/cspice/src/cspice-build/lib/libcspice.so"
"${EXTERNAL_BUILD_LIBRARIES}/lib${LIB_SUFFIX}/libcspice.so"
CACHE INTERNAL ""
)
# Disable -Werror=format-security for cspice only: distro hardening flags (e.g. Ubuntu Noble)
@ -1227,7 +1227,7 @@ if (LINUX) @@ -1227,7 +1227,7 @@ if (LINUX)
set_global_cache(LIBBLADERF_FOUND ON)
set(LIBBLADERF_EXTERNAL ON CACHE INTERNAL "")
set(LIBBLADERF_INCLUDE_DIRS "${EXTERNAL_BUILD_LIBRARIES}/bladerf/src/bladerf/host/libraries/libbladeRF/include" CACHE INTERNAL "")
set(LIBBLADERF_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/bladerf/src/bladerf-build/output/libbladeRF.so.2" CACHE INTERNAL "")
set(LIBBLADERF_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib${LIB_SUFFIX}/libbladeRF.so.2" CACHE INTERNAL "")
ExternalProject_Add(bladerf
GIT_REPOSITORY https://github.com/Nuand/bladeRF.git
GIT_TAG ${BLADERF_TAG}

Loading…
Cancel
Save