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

build-system: clean up handling of printing/manual

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2020-12-19 09:38:08 -08:00
parent dcec0175e2
commit 6e579f1c1b
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/build.sh
View file

@ -180,11 +180,6 @@ if [ "$BUILD_DESKTOP" = "1" ] || [ "$BUILDS" = "" ] ; then
echo "building Subsurface in ${SRC_DIR}/build" echo "building Subsurface in ${SRC_DIR}/build"
BUILDS+=( "DesktopExecutable" ) BUILDS+=( "DesktopExecutable" )
BUILDDIRS+=( "${BUILD_PREFIX}build" ) BUILDDIRS+=( "${BUILD_PREFIX}build" )
if [ "$BUILD_WITH_WEBKIT" = "1" ] ; then
PRINTING="-DNO_PRINTING=OFF"
else
PRINTING="-DNO_PRINTING=ON"
fi
fi fi
if [[ ! -d "${SRC_DIR}" ]] ; then if [[ ! -d "${SRC_DIR}" ]] ; then
@ -503,12 +498,6 @@ fi
cd "$SRC" cd "$SRC"
if [ "$BUILD_WITH_WEBKIT" = "1" ]; then
EXTRA_OPTS="-DNO_USERMANUAL=OFF"
else
EXTRA_OPTS="-DNO_USERMANUAL=ON"
fi
if [ "$QUICK" != "1" ] ; then if [ "$QUICK" != "1" ] ; then
# build the googlemaps map plugin # build the googlemaps map plugin
@ -540,6 +529,12 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do
BUILDDIR=${BUILDDIRS[$i]} BUILDDIR=${BUILDDIRS[$i]}
echo "build $SUBSURFACE_EXECUTABLE in $BUILDDIR" 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} cd "$SRC"/${SRC_DIR}
# pull the plasma-mobile components from upstream if building Subsurface-mobile # 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" \ -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" \
$LIBGIT2_FROM_PKGCONFIG \ $LIBGIT2_FROM_PKGCONFIG \
-DFORCE_LIBSSH=OFF \ -DFORCE_LIBSSH=OFF \
$PRINTING $EXTRA_OPTS \ $EXTRA_OPTS \
"$SRC"/${SRC_DIR} "$SRC"/${SRC_DIR}
if [ "$PLATFORM" = Darwin ] ; then if [ "$PLATFORM" = Darwin ] ; then