Browse Source

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 <rgetz503@gmail.com>
chirpmodem-v8.0.0
Robin Getz 2 months ago
parent
commit
a9d14d40ce
No known key found for this signature in database
GPG Key ID: 51C7231FFED0E060
  1. 4
      external/CMakeLists.txt

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