diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-12-19 09:38:08 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-19 15:33:17 -0800 |
| commit | 6e579f1c1baf98c9953c151a425e0cf5869b01d8 (patch) | |
| tree | 2869f27c6946ce15757f637f58d600f474c925fa /scripts | |
| parent | dcec0175e2bc66cd58741f8ff4075e466d1ab44e (diff) | |
| download | subsurface-6e579f1c1baf98c9953c151a425e0cf5869b01d8.tar.gz | |
build-system: clean up handling of printing/manual
This was wrong when running -both in the past. We only want these
options for desktop builds.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.sh | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index d07a56e83..93e1121fa 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -180,11 +180,6 @@ if [ "$BUILD_DESKTOP" = "1" ] || [ "$BUILDS" = "" ] ; then echo "building Subsurface in ${SRC_DIR}/build" BUILDS+=( "DesktopExecutable" ) BUILDDIRS+=( "${BUILD_PREFIX}build" ) - if [ "$BUILD_WITH_WEBKIT" = "1" ] ; then - PRINTING="-DNO_PRINTING=OFF" - else - PRINTING="-DNO_PRINTING=ON" - fi fi if [[ ! -d "${SRC_DIR}" ]] ; then @@ -503,12 +498,6 @@ fi cd "$SRC" -if [ "$BUILD_WITH_WEBKIT" = "1" ]; then - EXTRA_OPTS="-DNO_USERMANUAL=OFF" -else - EXTRA_OPTS="-DNO_USERMANUAL=ON" -fi - if [ "$QUICK" != "1" ] ; then # build the googlemaps map plugin @@ -540,6 +529,12 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do BUILDDIR=${BUILDDIRS[$i]} echo "build $SUBSURFACE_EXECUTABLE in $BUILDDIR" + if [ "$SUBSURFACE_EXECUTABLE" = "DesktopExecutable" ] && [ "$BUILD_WITH_WEBKIT" = "1" ]; then + EXTRA_OPTS="-DNO_USERMANUAL=OFF -DNO_PRINTING=OFF" + else + EXTRA_OPTS="-DNO_USERMANUAL=ON -DNO_PRINTING=ON" + fi + cd "$SRC"/${SRC_DIR} # pull the plasma-mobile components from upstream if building Subsurface-mobile @@ -561,7 +556,7 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" \ $LIBGIT2_FROM_PKGCONFIG \ -DFORCE_LIBSSH=OFF \ - $PRINTING $EXTRA_OPTS \ + $EXTRA_OPTS \ "$SRC"/${SRC_DIR} if [ "$PLATFORM" = Darwin ] ; then |