mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

build script: move related code closer together

Browse source 
This just makes it more obvious what we are doing.

This appears only necessary on macOS.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-12-29 12:13:20 -08:00
parent 4fb99680f3
commit 8f153384b5
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scripts/build.sh
View file

@ -210,6 +210,21 @@ else
[ -z $QMAKE ] && echo "cannot find qmake or qmake-qt5" && exit 1 [ -z $QMAKE ] && echo "cannot find qmake or qmake-qt5" && exit 1
fi fi
# it's not entirely clear why we only set this on macOS, but this appears to be what works
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
else
echo "something is broken with the Qt install"
exit 1
fi
fi
fi
# on Debian and Ubuntu based systems, the private QtLocation and # on Debian and Ubuntu based systems, the private QtLocation and
# QtPositioning headers aren't bundled. Download them if necessary. # QtPositioning headers aren't bundled. Download them if necessary.
if [ "$PLATFORM" = Linux ] ; then if [ "$PLATFORM" = Linux ] ; then
@ -470,19 +485,6 @@ make install
# make sure we know where the libdivecomputer.a was installed - sometimes it ends up in lib64, sometimes in lib # make sure we know where the libdivecomputer.a was installed - sometimes it ends up in lib64, sometimes in lib
STATIC_LIBDC="$INSTALL_ROOT/$(grep ^libdir Makefile | cut -d/ -f2)/libdivecomputer.a" STATIC_LIBDC="$INSTALL_ROOT/$(grep ^libdir Makefile | cut -d/ -f2)/libdivecomputer.a"
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
else
echo "something is broken with the Qt install"
exit 1
fi
fi
fi
cd "$SRC" cd "$SRC"
if [ "$QUICK" != "1" ] && [ "$BUILD_DESKTOP$BUILD_MOBILE" != "" ] ; then if [ "$QUICK" != "1" ] && [ "$BUILD_DESKTOP$BUILD_MOBILE" != "" ] ; then