Compare commits

..

No commits in common. "2c6716907e3ac64aa4f0b3efa03c7a23b340f2f9" and "74b52f7b97e7036c88f787697296ad560fc51ddc" have entirely different histories.

View File

@ -302,9 +302,6 @@ 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)
@ -787,7 +784,9 @@ IF (APPLE AND BUNDLE_APP)
IF (BUNDLE_SOAPY_MODS)
message(STATUS "SOAPY_ROOT: ${SOAPY_SDR_ROOT}")
SET(SOAPY_SDR_MOD_PATH "${SOAPY_SDR_ROOT}/lib/SoapySDR/modules${SOAPY_SDR_ABI_VERSION}")
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}")
message(STATUS "SOAPY_SDR_MOD_PATH: ${SOAPY_SDR_MOD_PATH}")
file(GLOB SOAPY_MODS ${SOAPY_SDR_MOD_PATH}/*.so)