diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index 05cee0a55..aa042aca4 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -121,7 +121,7 @@ jobs: rm -f /usr/local/bin/2to3 brew install opencv - name: Install brew packages - run: brew install nasm boost hidapi libusb fftw faad2 zlib airspy airspyhf hackrf rtl-sdr libbladerf soapysdr qt + run: brew install nasm boost hidapi libusb fftw faad2 zlib airspy airspyhf hackrf rtl-sdr libbladerf soapysdr qt subversion - name: Configure SDRangel run: | mkdir build && cd build diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 5354c9a31..ca89be680 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -876,10 +876,10 @@ if(ENABLE_FEATURE_MORSEDECODER) if (WIN32) install(FILES "${SDRANGEL_BINARY_BIN_DIR}/ggmorse${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}") elseif (APPLE) - set(GGMORSE_LIBRARIES "${binary_dir}/libsggmorse/libggmorse${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") - install(DIRECTORY "${binary_dir}/libggmorse" DESTINATION "${INSTALL_LIB_DIR}" + set(GGMORSE_LIBRARIES "${binary_dir}/src/libggmorse${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") + install(DIRECTORY "${binary_dir}/src" DESTINATION "${INSTALL_LIB_DIR}" FILES_MATCHING PATTERN "libggmorse*${CMAKE_SHARED_LIBRARY_SUFFIX}") - set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}/libggmorse") + set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}/src") endif () endif()