diff --git a/cmake/Findportaudio-2.0.cmake b/cmake/Findportaudio-2.0.cmake index 4cc4f412..24674bb3 100644 --- a/cmake/Findportaudio-2.0.cmake +++ b/cmake/Findportaudio-2.0.cmake @@ -79,6 +79,7 @@ else (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS) endif (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARIES) if (PORTAUDIO_FOUND) + set(portaudio_BINARY_DIR ${PORTAUDIO_LIBRARY_DIR}) if (NOT PORTAUDIO_FIND_QUIETLY) message(STATUS "Found portaudio: ${PORTAUDIO_LIBRARIES}") endif (NOT PORTAUDIO_FIND_QUIETLY) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 86c766fe..c059a6b5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -160,7 +160,7 @@ if(APPLE) TARGET FreeDV POST_BUILD COMMAND rm -rf dist_tmp FreeDV.dmg || true - COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${LPCNET_BUILD_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${LPCNET_BUILD_DIR}/src -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/LPCNet_build/src -s ${CMAKE_BINARY_DIR}/codec2_build/src + COMMAND DYLD_LIBRARY_PATH=${CODEC2_BUILD_DIR}/src:${LPCNET_BUILD_DIR}/src:${portaudio_BINARY_DIR}:${samplerate_BINARY_DIR}/src:${DYLD_LIBRARY_PATH} ${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler ARGS -od -b -x FreeDV.app/Contents/MacOS/FreeDV -d FreeDV.app/Contents/libs -p @loader_path/../libs/ -i /usr/lib -s ${LPCNET_BUILD_DIR}/src -s ${CODEC2_BUILD_DIR}/src -s ${CMAKE_BINARY_DIR}/LPCNet_build/src -s ${CMAKE_BINARY_DIR}/codec2_build/src -s ${portaudio_BINARY_DIR} -s ${samplerate_BINARY_DIR}/src COMMAND cp ARGS ${CMAKE_CURRENT_SOURCE_DIR}/freedv.icns FreeDV.app/Contents/Resources COMMAND mkdir dist_tmp COMMAND cp -r FreeDV.app dist_tmp