diff --git a/CI/build-osx.sh b/CI/build-osx.sh index 48c3ed08..098ade18 100755 --- a/CI/build-osx.sh +++ b/CI/build-osx.sh @@ -1,10 +1,11 @@ #!/bin/sh set -ex -mkdir build && cd build +export QT_PREFIX="$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)" +mkdir build && cd build cmake .. \ - -DQTDIR=/usr/local/opt/qt5 \ + -DQTDIR="$QT_PREFIX" \ -DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \ -DOBS_FRONTEND_LIB="$(pwd)/../../obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib" \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh index 66d1562f..50b43b4e 100755 --- a/CI/install-dependencies-osx.sh +++ b/CI/install-dependencies-osx.sh @@ -8,7 +8,7 @@ brew install libav # qtwebsockets deps brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/fdb7c6e960e830b3bf630850c0002c5df9f68ed8/Formula/qt5.rb -echo "Qt path: $(find /usr/local/Cellar/qt -d 1 | tail -n 1)" +echo "Qt path: $(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)" # Build obs-studio cd .. diff --git a/CI/package-osx.sh b/CI/package-osx.sh index c47fda40..9d9ea89e 100755 --- a/CI/package-osx.sh +++ b/CI/package-osx.sh @@ -3,7 +3,7 @@ set -e echo "-- Preparing package build" -export QT_PREFIX="/usr/local/opt/qt5" +export QT_PREFIX="$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)" export WS_LIB="$QT_PREFIX/lib/QtWebSockets.framework/QtWebSockets" export NET_LIB="$QT_PREFIX/lib/QtNetwork.framework/QtNetwork" @@ -28,15 +28,15 @@ chmod +rw ./build/QtWebSockets ./build/QtNetwork echo "-- Modifying QtNetwork" install_name_tool \ - -change /usr/local/opt/qt/lib/QtNetwork.framework/Versions/5/QtNetwork @rpath/QtNetwork \ - -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @rpath/QtCore \ + -change "/usr/local/opt/qt5/lib/QtNetwork.framework/Versions/5/QtNetwork" @rpath/QtNetwork \ + -change "$QT_PREFIX/lib/QtCore.framework/Versions/5/QtCore" @rpath/QtCore \ ./build/QtNetwork echo "-- Modifying QtWebSockets" install_name_tool \ - -change /usr/local/opt/qt/lib/QtWebSockets.framework/Versions/5/QtWebSockets @rpath/QtWebSockets \ - -change /usr/local/opt/qt/lib/QtNetwork.framework/Versions/5/QtNetwork @rpath/QtNetwork \ - -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @rpath/QtCore \ + -change "/usr/local/opt/qt5/lib/QtWebSockets.framework/Versions/5/QtWebSockets" @rpath/QtWebSockets \ + -change "$QT_PREFIX/lib/QtNetwork.framework/Versions/5/QtNetwork" @rpath/QtNetwork \ + -change "$QT_PREFIX/lib/QtCore.framework/Versions/5/QtCore" @rpath/QtCore \ ./build/QtWebSockets echo "-- Modifying obs-websocket.so"