From a9d14d40ce48c259de4faa4fb7b4933bfe0f1648 Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Sun, 27 Sep 2026 18:42:36 -0400 Subject: [PATCH 1/2] external/CMakeLists.txt : Fix external library paths for Linux Update CSPICE and bladeRF library paths to use the common external library output directory, including LIB_SUFFIX. This matches the output location configured by COMMON_CMAKE_ARGS and fixes builds using the externally built CSPICE and bladeRF libraries. Signed-off-by: Robin Getz --- external/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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} From 7c81d2fda846d16276e4419963be5116848b41df Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Sun, 27 Sep 2026 18:43:56 -0400 Subject: [PATCH 2/2] CMakeLists.txt : Find FFTW3F when external libraries are enabled FFTW3F is required unconditionally on Linux, but was only searched for when ENABLE_EXTERNAL_LIBRARIES was AUTO. With ENABLE_EXTERNAL_LIBRARIES set to ON, FFTW3F was neither found as a system library nor built as an external dependency, resulting in build failures. Find the system FFTW3F package when external libraries are explicitly enabled on Linux. Signed-off-by: Robin Getz --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2621e1212..fdd9ce7ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -991,6 +991,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"))