rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

OSX: Fix lack of newlines in build messages

This commit is contained in:
Povilas Kanapickas 2018-10-19 00:46:57 +03:00
parent ab887a4e90
commit fe1568f4ca
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osx_environment.sh
View File

@ -2,13 +2,13 @@
if [ ! $BARRIER_BUILD_ENV ]; then if [ ! $BARRIER_BUILD_ENV ]; then
printf "Modifying environment for Barrier build..." printf "Modifying environment for Barrier build...\n"
if command -v port; then if command -v port; then
printf "Detected Macports" printf "Detected Macports\n"
if [ ! -d /opt/local/lib/cmake/Qt5 ]; then if [ ! -d /opt/local/lib/cmake/Qt5 ]; then
printf "Please install qt5-qtbase port" printf "Please install qt5-qtbase port\n"
fi fi
export BARRIER_BUILD_MACPORTS=1 export BARRIER_BUILD_MACPORTS=1
export CMAKE_PREFIX_PATH="/opt/local/lib/cmake/Qt5:$CMAKE_PREFIX_PATH" export CMAKE_PREFIX_PATH="/opt/local/lib/cmake/Qt5:$CMAKE_PREFIX_PATH"
@ -17,7 +17,7 @@ if [ ! $BARRIER_BUILD_ENV ]; then
export PKG_CONFIG_PATH="/opt/local/libexec/qt5/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="/opt/local/libexec/qt5/lib/pkgconfig:$PKG_CONFIG_PATH"
elif command -v brew; then elif command -v brew; then
printf "Detected Homebrew" printf "Detected Homebrew\n"
QT_PATH=$(brew --prefix qt) QT_PATH=$(brew --prefix qt)
OPENSSL_PATH=$(brew --prefix openssl) OPENSSL_PATH=$(brew --prefix openssl)
@ -28,7 +28,7 @@ if [ ! $BARRIER_BUILD_ENV ]; then
export PKG_CONFIG_PATH="$OPENSSL_PATH/lib/pkgconfig:$PKG_CONFIG_PATH" export PKG_CONFIG_PATH="$OPENSSL_PATH/lib/pkgconfig:$PKG_CONFIG_PATH"
else else
printf "Neither Homebrew nor Macports is installed. Can't get dependency paths" printf "Neither Homebrew nor Macports is installed. Can't get dependency paths\n"
exit 1 exit 1
fi fi