diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8f23856d371..230c6ecfe78 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -517,14 +517,21 @@ jobs: # fix openssl header not found ln -sf /usr/local/opt/openssl/include/openssl /usr/local/include/openssl + - name: Install npm packages + run: | + npm install + + - name: Remove dynamic libraries + run: | + # find *.dylib in $(brew --prefix) and delete them except if they start with /usr/local/lib/libboost + find $(brew --prefix) -name "*.dylib" -delete + - name: Build MacOS env: BRANCH: ${{ github.head_ref || github.ref_name }} BUILD_VERSION: ${{ needs.check_changelog.outputs.next_version_bare }} COMMIT: ${{ github.event.pull_request.head.sha || github.sha }} run: | - npm install - mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Release \ diff --git a/cmake/compile_definitions/macos.cmake b/cmake/compile_definitions/macos.cmake index 3bcf9528361..bee347576dd 100644 --- a/cmake/compile_definitions/macos.cmake +++ b/cmake/compile_definitions/macos.cmake @@ -5,7 +5,6 @@ add_compile_definitions(SUNSHINE_PLATFORM="macos") link_directories(/opt/local/lib) link_directories(/usr/local/lib) link_directories(/opt/homebrew/lib) -ADD_DEFINITIONS(-DBOOST_LOG_DYN_LINK) list(APPEND SUNSHINE_EXTERNAL_LIBRARIES ${APP_SERVICES_LIBRARY} diff --git a/cmake/dependencies/macos.cmake b/cmake/dependencies/macos.cmake index 7d8e211e242..b189e403363 100644 --- a/cmake/dependencies/macos.cmake +++ b/cmake/dependencies/macos.cmake @@ -10,3 +10,7 @@ FIND_LIBRARY(VIDEO_TOOLBOX_LIBRARY VideoToolbox) if(SUNSHINE_ENABLE_TRAY) FIND_LIBRARY(COCOA Cocoa REQUIRED) endif() + +set(Boost_USE_STATIC_LIBS ON) # cmake-lint: disable=C0103 +# workaround to prevent link errors against icudata, icui18n +set(Boost_NO_BOOST_CMAKE ON) # cmake-lint: disable=C0103