diff options
author | Rolf Eike Beer <eike@sf-mail.de> | 2019-03-20 22:16:56 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2019-03-21 19:30:14 -0700 |
commit | d104506f982955c7486a1bd931ba4fc98a516b5c (patch) | |
tree | ef520d160d1984781460ae127f25699fd995e9f9 /packaging/android/build.sh | |
parent | 3b3306c552c89196da60fbbc70b7a7e50e81f541 (diff) | |
download | subsurface-d104506f982955c7486a1bd931ba4fc98a516b5c.tar.gz |
CMake: use builtin method to not use BZip2
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
Diffstat (limited to 'packaging/android/build.sh')
-rwxr-xr-x | packaging/android/build.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 1cf013ead..8b5459980 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -268,7 +268,7 @@ if [ "$QUICK" = "" ] ; then git reset --hard sed -i 's/SIZEOF_SIZE_T/__SIZEOF_SIZE_T__/g' lib/compat.h # also, don't deal with manuals and bzip2 - sed -i 's/ADD_SUBDIRECTORY(man)//;s/FIND_PACKAGE(BZip2)/# FIND_PACKAGE(BZip2)/' CMakeLists.txt + sed -i 's/ADD_SUBDIRECTORY(man)//' CMakeLists.txt popd mkdir -p libzip-build-"$ARCH" pushd libzip-build-"$ARCH" @@ -278,6 +278,7 @@ if [ "$QUICK" = "" ] ; then -DCMAKE_INSTALL_PREFIX="$PREFIX" \ -DCMAKE_INSTALL_LIBDIR="lib" \ -DBUILD_SHARED_LIBS=OFF \ + -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE \ ../libzip/ make make install |