diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-07 12:35:49 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-10-08 12:19:39 -0700 |
| commit | 2dd28e3c8d280f16fb073ac8b343ef5be2f0210b (patch) | |
| tree | 9eaa0f02d6f41826afba3639b79959deaad5807f /scripts/build.sh | |
| parent | 51c84b3c4428eb81751f4bb6eb5d14def61d1be5 (diff) | |
| download | subsurface-2dd28e3c8d280f16fb073ac8b343ef5be2f0210b.tar.gz | |
build-system: remove building Grantlee from build script
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/build.sh')
| -rwxr-xr-x | scripts/build.sh | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index a6bfd65b4..9d115310e 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -154,7 +154,6 @@ fi # normally this script builds the desktop version in subsurface/build # if the first argument is "-mobile" then build Subsurface-mobile in "$BUILD_PREFIX"build-mobile # if the first argument is "-both" then build both in subsurface/build and "$BUILD_PREFIX"build-mobile -BUILDGRANTLEE=0 if [ "$BUILD_MOBILE" = "1" ] ; then echo "building Subsurface-mobile in ${SRC_DIR}/build-mobile" @@ -171,9 +170,6 @@ if [ "$BUILD_DESKTOP" = "1" ] ; then BUILDDIRS+=( "${BUILD_PREFIX}build" ) if [ "$BUILD_WITH_WEBKIT" = "1" ] ; then PRINTING="-DNO_PRINTING=OFF" - if [ "$QUICK" != "1" ] ; then - BUILDGRANTLEE=1 - fi else PRINTING="-DNO_PRINTING=ON" fi @@ -486,22 +482,6 @@ else EXTRA_OPTS="-DNO_USERMANUAL=ON" fi -if [ "$BUILDGRANTLEE" = "1" ] ; then - # build grantlee - cd "$SRC" - ./${SRC_DIR}/scripts/get-dep-lib.sh single . grantlee - pushd grantlee - mkdir -p build - cd build - cmake "$OLDER_MAC_CMAKE" -DCMAKE_BUILD_TYPE="$DEBUGRELEASE" \ - -DCMAKE_INSTALL_PREFIX="$INSTALL_ROOT" \ - -DBUILD_TESTS=NO \ - "$SRC"/grantlee - make -j4 - make install - popd -fi - if [ "$QUICK" != "1" ] ; then # build the googlemaps map plugin |