Compare commits

..

2 Commits

Author SHA1 Message Date
Charles J. Cliffe
2c6716907e Actual fix was in build repo; revert ABI version reference 2023-08-17 00:51:36 -04:00
Charles J. Cliffe
fcb646f385 Use prefix lib path if provided so we can override system libs for bundles 2023-08-17 00:15:32 -04:00

View File

@ -302,6 +302,9 @@ IF (APPLE)
SET(CMAKE_OSX_DEPLOYMENT_TARGET, "10.9")
SET(LIQUID_LIB liquid)
IF(CMAKE_INSTALL_PREFIX)
link_directories(${CMAKE_INSTALL_PREFIX}/lib)
ENDIF(CMAKE_INSTALL_PREFIX)
link_directories(/usr/local/lib)
link_directories(/opt/local/lib)
@ -784,9 +787,7 @@ IF (APPLE AND BUNDLE_APP)
IF (BUNDLE_SOAPY_MODS)
message(STATUS "SOAPY_ROOT: ${SOAPY_SDR_ROOT}")
string(REPLACE "-" ";" SOAPY_SDR_ABI_VERSION_LIST ${SOAPY_SDR_ABI_VERSION})
list(GET SOAPY_SDR_ABI_VERSION_LIST 0 SOAPY_SDR_MOD_DIR_SUFFIX)
SET(SOAPY_SDR_MOD_PATH "${SOAPY_SDR_ROOT}/lib/SoapySDR/modules${SOAPY_SDR_MOD_DIR_SUFFIX}")
SET(SOAPY_SDR_MOD_PATH "${SOAPY_SDR_ROOT}/lib/SoapySDR/modules${SOAPY_SDR_ABI_VERSION}")
message(STATUS "SOAPY_SDR_MOD_PATH: ${SOAPY_SDR_MOD_PATH}")
file(GLOB SOAPY_MODS ${SOAPY_SDR_MOD_PATH}/*.so)