@@ -47,18 +47,17 @@ jobs:
4747 cmake --build .
4848 sudo cmake --build . --target install
4949 elif [ "$RUNNER_OS" == "macOS" ]; then
50- # Install build tools needed for libsystemd
51- brew install meson ninja libmng dbus
5250 # Install other dependencies
5351 brew install cmake pkg-config fftw mpv curl fmt rapidjson
54- export PKG_CONFIG_PATH="/usr/local/lib:/opt/homebrew/lib:$PKG_CONFIG_PATH"
55- # Manually build and install sdbus-c++ for macOS
56- #git clone --depth 1 https://github.com/Kistler-Group/sdbus-cpp.git
57- #cd sdbus-cpp
58- #mkdir build && cd build
59- #cmake .. -DCMAKE_BUILD_TYPE=Release -DSDBUSCPP_BUILD_CODEGEN=ON
60- #cmake --build .
61- #sudo cmake --build . --target install
52+
53+ # Set environment variables for Homebrew paths
54+ # Detect Homebrew prefix (Apple Silicon uses /opt/homebrew, Intel uses /usr/local)
55+ BREW_PREFIX=$(brew --prefix)
56+ echo "HOMEBREW_PREFIX=${BREW_PREFIX}" >> $GITHUB_ENV
57+ echo "PKG_CONFIG_PATH=${BREW_PREFIX}/lib/pkgconfig:${BREW_PREFIX}/opt/curl/lib/pkgconfig:${BREW_PREFIX}/opt/fmt/lib/pkgconfig" >> $GITHUB_ENV
58+ echo "CMAKE_PREFIX_PATH=${BREW_PREFIX}" >> $GITHUB_ENV
59+ echo "LDFLAGS=-L${BREW_PREFIX}/lib" >> $GITHUB_ENV
60+ echo "CPPFLAGS=-I${BREW_PREFIX}/include" >> $GITHUB_ENV
6261 # elif [ "$RUNNER_OS" == "Windows" ]; then
6362 # choco install cmake
6463 # # Note: Windows build requires vcpkg or manual dependency setup
@@ -70,11 +69,16 @@ jobs:
7069 mkdir build
7170 cd build
7271 if [ "${{ matrix.target }}" == "macos-arm64" ]; then
73- export PKG_CONFIG_PATH="/usr/local/lib:/opt/homebrew/lib:$PKG_CONFIG_PATH"
74- cmake .. -DWITH_MPRIS=OFF -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_BUILD_TYPE=Release
72+ cmake .. \
73+ -DWITH_MPRIS=OFF \
74+ -DCMAKE_OSX_ARCHITECTURES=arm64 \
75+ -DCMAKE_BUILD_TYPE=Release \
76+ -DCMAKE_PREFIX_PATH="${HOMEBREW_PREFIX}"
7577 elif [ "${{ matrix.target }}" == "macos-x64" ]; then
76- export PKG_CONFIG_PATH="/usr/local/lib:/opt/homebrew/lib:$PKG_CONFIG_PATH"
77- cmake .. -DWITH_MPRIS=OFF -DCMAKE_BUILD_TYPE=Release
78+ cmake .. \
79+ -DWITH_MPRIS=OFF \
80+ -DCMAKE_BUILD_TYPE=Release \
81+ -DCMAKE_PREFIX_PATH="${HOMEBREW_PREFIX}"
7882 else
7983 cmake .. -DCMAKE_BUILD_TYPE=Release
8084 fi
@@ -136,7 +140,6 @@ jobs:
136140 ## Downloads
137141 Download the appropriate binary for your platform:
138142 - **Linux (x64)**: tuisic-linux-x64
139- # - **Windows (x64)**: tuisic-windows-x64.exe
140143 - **macOS (Intel)**: tuisic-macos-x64
141144 - **macOS (Apple Silicon)**: tuisic-macos-arm64
142145 files : |
0 commit comments