diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-12-29 11:09:39 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-29 13:39:16 -0800 |
| commit | 4fb99680f39daa4512aa6cfbc867f45808e2125a (patch) | |
| tree | a1f9a26dbe0c97c49af9328f521fbc0ec9e3ceb4 | |
| parent | 2a6fe54ac308f4d5a84a3e73d14ffde7d7502ee3 (diff) | |
| download | subsurface-4fb99680f39daa4512aa6cfbc867f45808e2125a.tar.gz | |
build script: remove the long outdated Qt detection
We now require qmake to be found much earlier in the script so we can simply
use that to get the right prefix path.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rwxr-xr-x | scripts/build.sh | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index dafa1bb03..dccf0854b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -472,26 +472,12 @@ STATIC_LIBDC="$INSTALL_ROOT/$(grep ^libdir Makefile | cut -d/ -f2)/libdivecomput if [ "$PLATFORM" = Darwin ] ; then if [ -z "$CMAKE_PREFIX_PATH" ] ; then + # we already found qmake and can get the right path information from that libdir=$($QMAKE -query QT_INSTALL_LIBS) if [ $? -eq 0 ]; then export CMAKE_PREFIX_PATH=$libdir/cmake - elif [ -d "$HOME/Qt/5.9.1" ] ; then - export CMAKE_PREFIX_PATH=~/Qt/5.9.1/clang_64/lib/cmake - elif [ -d "$HOME/Qt/5.9" ] ; then - export CMAKE_PREFIX_PATH=~/Qt/5.9/clang_64/lib/cmake - elif [ -d "$HOME/Qt/5.8" ] ; then - export CMAKE_PREFIX_PATH=~/Qt/5.8/clang_64/lib/cmake - elif [ -d "$HOME/Qt/5.7" ] ; then - export CMAKE_PREFIX_PATH=~/Qt/5.7/clang_64/lib/cmake - elif [ -d "$HOME/Qt/5.6" ] ; then - export CMAKE_PREFIX_PATH=~/Qt/5.6/clang_64/lib/cmake - elif [ -d "$HOME/Qt/5.5" ] ; then - export CMAKE_PREFIX_PATH=~/Qt/5.5/clang_64/lib/cmake - elif [ -d /usr/local/opt/qt5/lib ] ; then - # Homebrew location for qt5 package - export CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake else - echo "cannot find Qt 5.5 or newer in ~/Qt" + echo "something is broken with the Qt install" exit 1 fi fi |