mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-02 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system: Qt6 so far is missing Qt Location

Browse source 
So don't try to find the private headers and don't try to build the googlemaps
map plugin.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2022-02-03 21:27:50 -08:00
parent da3417123a
commit c4319e3995
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/build.sh
View file

@ -229,6 +229,9 @@ if [[ -z $QMAKE || ! -x $QMAKE ]] ; then
[ -z $QMAKE ] && echo "cannot find qmake, qmake-qt5, or qmake-qt6" && exit 1 [ -z $QMAKE ] && echo "cannot find qmake, qmake-qt5, or qmake-qt6" && exit 1
fi fi
# grab the Qt version
QT_VERSION=$($QMAKE -query QT_VERSION)
# it's not entirely clear why we only set this on macOS, but this appears to be what works # it's not entirely clear why we only set this on macOS, but this appears to be what works
if [ "$PLATFORM" = Darwin ] ; then if [ "$PLATFORM" = Darwin ] ; then
if [ -z "$CMAKE_PREFIX_PATH" ] ; then if [ -z "$CMAKE_PREFIX_PATH" ] ; then
@ -246,9 +249,8 @@ 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 ] && [[ $QT_VERSION == 5* ]] ; then
QT_HEADERS_PATH=$($QMAKE -query QT_INSTALL_HEADERS) QT_HEADERS_PATH=$($QMAKE -query QT_INSTALL_HEADERS)
QT_VERSION=$($QMAKE -query QT_VERSION)
if [ ! -d "$QT_HEADERS_PATH/QtLocation/$QT_VERSION/QtLocation/private" ] && if [ ! -d "$QT_HEADERS_PATH/QtLocation/$QT_VERSION/QtLocation/private" ] &&
[ ! -d "$INSTALL_ROOT"/include/QtLocation/private ] ; then [ ! -d "$INSTALL_ROOT"/include/QtLocation/private ] ; then
@ -508,7 +510,7 @@ STATIC_LIBDC="$INSTALL_ROOT/$(grep ^libdir Makefile | cut -d/ -f2)/libdivecomput
cd "$SRC" cd "$SRC"
if [ "$QUICK" != "1" ] && [ "$BUILD_DESKTOP$BUILD_MOBILE" != "" ] ; then if [ "$QUICK" != "1" ] && [ "$BUILD_DESKTOP$BUILD_MOBILE" != "" ] && [[ $QT_VERSION == 5* ]] ; then
# build the googlemaps map plugin # build the googlemaps map plugin
cd "$SRC" cd "$SRC"