Changeset 8c31a17 in subsurface


Ignore:
Timestamp:
Jul 15, 2017, 9:39:54 PM (2 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
a629eb7
Parents:
d943a843
Message:

Mac build: newer Qt comes without WebKit?

Allow turning it on for those who have it, but by default
build without it on Mac.

Signed-off-by: Dirk Hohndel <dirk@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • scripts/build.sh

    rd943a843 r8c31a17  
    2020exec 1> >(tee build.log) 2>&1
    2121
     22SRC=$(pwd)
     23PLATFORM=$(uname)
     24
    2225# in order to build the dependencies on Mac for release builds (to deal with the macosx-version-min for those
    2326# call this script with -build-deps
     
    2730fi
    2831
    29 SRC=$(pwd)
    30 PLATFORM=$(uname)
     32# unless you build Qt from source (or at least webkit from source, you won't have webkit installed
     33# -build-with-webkit tells the script that in fact we can assume that webkit is present (it usually
     34# is still available on Linux distros)
     35if [ "$1" == "-build-with-webkit" ] ; then
     36        shift
     37        BUILD_WITH_WEBKIT="1"
     38fi
     39if [ $PLATFORM = Linux ] ; then
     40        BUILD_WITH_WEBKIT="1"
     41fi
    3142
    3243# most of these will only be needed with -build-deps on a Mac
     
    7788        BUILDS=( "DesktopExecutable" "MobileExecutable" )
    7889        BUILDDIRS=( "build" "build-mobile" )
    79         BUILDGRANTLEE=1
    80         BUILDMARBLE=1
     90        if [ "$BUILD_WITH_WEBKIT" = "1" ] ; then
     91                BUILDGRANTLEE=1
     92                BUILDMARBLE=1
     93        fi
    8194        shift
    8295else
     
    8497        BUILDS=( "DesktopExecutable" )
    8598        BUILDDIRS=( "build" )
    86         BUILDGRANTLEE=1
    87         BUILDMARBLE=1
     99        if [ "$BUILD_WITH_WEBKIT" = "1" ] ; then
     100                BUILDGRANTLEE=1
     101                BUILDMARBLE=1
     102        fi
    88103fi
    89104
     
    293308
    294309if [ $BUILDMARBLE = 1 ]; then
     310        MARBLE_OPTS="-DMARBLE_INCLUDE_DIR=$INSTALL_ROOT/include \
     311                -DMARBLE_LIBRARIES=$INSTALL_ROOT/lib/libssrfmarblewidget.$SH_LIB_EXT \
     312                -DNO_MARBLE=OFF -DNO_USERMANUAL=OFF -DFBSUPPORT=ON"
    295313        if [ ! -d marble-source ] ; then
    296314                if [[ $1 = local ]] ; then
     
    355373                fi
    356374        fi
     375else
     376        MARBLE_OPTS="-DNO_MARBLE=ON -DNO_USERMANUAL=ON -DFBSUPPORT=OFF"
    357377fi
    358378
    359379if [ "$BUILDGRANTLEE" = "1" ] ; then
    360380        # build grantlee
     381        PRINTING="-DNO_PRINTING=OFF"
    361382
    362383        cd $SRC
     
    409430                -DLIBDIVECOMPUTER_INCLUDE_DIR=$INSTALL_ROOT/include \
    410431                -DLIBDIVECOMPUTER_LIBRARIES=$INSTALL_ROOT/lib/libdivecomputer.a \
    411                 -DMARBLE_INCLUDE_DIR=$INSTALL_ROOT/include \
    412                 -DMARBLE_LIBRARIES=$INSTALL_ROOT/lib/libssrfmarblewidget.$SH_LIB_EXT \
    413432                -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH \
    414                 -DNO_PRINTING=OFF
     433                $PRINTING $MARBLE_OPTS
    415434
    416435        if [ $PLATFORM = Darwin ] ; then
Note: See TracChangeset for help on using the changeset viewer.