From aaa2cd6f0483defacedfd650161424affe9fd648 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Sat, 25 Jun 2022 14:37:47 +0100 Subject: [PATCH] Support Homebrew on M1 Homebrew uses prefix path on M1 (`/opt/homebrew`) different from x86_64 Homebrew path. It can be queried with `brew --prefix` command, which allows supporting both platforms in `mac/before_install.sh`. --- CI/mac/before_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/mac/before_install.sh b/CI/mac/before_install.sh index 8a440f565..34e34d390 100644 --- a/CI/mac/before_install.sh +++ b/CI/mac/before_install.sh @@ -5,4 +5,4 @@ brew update brew install smpeg2 libpng freetype qt5 ffmpeg ninja boost tbb luajit brew install sdl2 sdl2_ttf sdl2_image sdl2_mixer -echo CMAKE_PREFIX_PATH="/usr/local/opt/ffmpeg@4:/usr/local/opt/qt5:$CMAKE_PREFIX_PATH" >> $GITHUB_ENV +echo CMAKE_PREFIX_PATH="$(brew --prefix)/opt/ffmpeg@4:$(brew --prefix)/opt/qt5:$CMAKE_PREFIX_PATH" >> $GITHUB_ENV