X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmacosx%2Fsigrok-native-macosx;h=cb1435e4769ca69499a002acc635661ea6616ec4;hp=5ba3de2a862e6e5ddba3e62de7b83ce152c60106;hb=20e302a299c6b625aed33cc0865d8d8f31969697;hpb=616a4523599b4c2925b5811fdb3dfdd6fa12602e diff --git a/cross-compile/macosx/sigrok-native-macosx b/cross-compile/macosx/sigrok-native-macosx index 5ba3de2..cb1435e 100755 --- a/cross-compile/macosx/sigrok-native-macosx +++ b/cross-compile/macosx/sigrok-native-macosx @@ -44,8 +44,11 @@ PARALLEL="-j "`sysctl -n hw.ncpu` export CC=gcc export CXX=g++ +# We use Qt 5.5 in order to remain compatible with more versions of Mac OS X. +QTVER=qt@5.5 + # Path to Qt5 binaries (needed for cmake to find the Qt5 libs). -export PATH=`brew list qt5 | grep bin | head -n 1 | xargs dirname`":$PATH" +export PATH=`brew list $QTVER | grep bin | head -n 1 | xargs dirname`":$PATH" # Path to Python 2/3 pkg-config files. # In Homebrew, pkg-config files of "keg-only" formulas (Python is one of them) @@ -57,7 +60,7 @@ PY3=`brew list python3 | grep pkgconfig | head -n 1 | xargs dirname` # ----------------------------------------------------------------------------- -P="$PREFIX/lib/pkgconfig:$PY2:$PY3" +P="$PREFIX/lib/pkgconfig:/usr/local/opt/$QTVER/lib/pkgconfig:$PY2:$PY3" C="$C --prefix=$PREFIX" # Remove build directory contents (if any) and create a new build dir.