mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

CMake: just tell CMake to not find HTTP_Parser

Browse source 
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
This commit is contained in:
Rolf Eike Beer 2019-03-04 18:50:19 +01:00 • committed by Dirk Hohndel
parent aa7f9a18f2
commit 9bbb6f785c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/android/build.sh
View file

@ -287,7 +287,6 @@ if [ "$QUICK" = "" ] ; then
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libgit2 "${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libgit2
if [ ! -e "$PKG_CONFIG_LIBDIR/libgit2.pc" ] ; then if [ ! -e "$PKG_CONFIG_LIBDIR/libgit2.pc" ] ; then
# We don't want to find the HTTP_Parser package of the build host by mistake # We don't want to find the HTTP_Parser package of the build host by mistake
perl -pi -e 's/FIND_PACKAGE\(HTTP_Parser\)/#FIND_PACKAGE(HTTP_Parser)/' libgit2/CMakeLists.txt
mkdir -p libgit2-build-"$ARCH" mkdir -p libgit2-build-"$ARCH"
pushd libgit2-build-"$ARCH" pushd libgit2-build-"$ARCH"
cmake \ cmake \
@ -301,6 +300,7 @@ if [ "$QUICK" = "" ] ; then
-DOPENSSL_CRYPTO_LIBRARY="$PREFIX"/lib/libcrypto.so \ -DOPENSSL_CRYPTO_LIBRARY="$PREFIX"/lib/libcrypto.so \
-DOPENSSL_INCLUDE_DIR="$PREFIX"/include/openssl \ -DOPENSSL_INCLUDE_DIR="$PREFIX"/include/openssl \
-D_OPENSSL_VERSION="${OPENSSL_VERSION}" \ -D_OPENSSL_VERSION="${OPENSSL_VERSION}" \
-DCMAKE_DISABLE_FIND_PACKAGE_HTTP_Parser=TRUE \
../libgit2/ ../libgit2/
make make
make install make install