diff --git a/CMakeLists.txt b/CMakeLists.txt index 56399cc89..37a3a73f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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")) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index d246acf05..eabfd9b1c 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -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) 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}