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

Android: ask which pkg-config to use

Browse source 
Since pkg-config is installed in different places on linux and mac,
let's ask where it is.

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Joakim Bygdell 2015-11-08 16:50:50 +01:00 • committed by Dirk Hohndel
parent bc1473b1a0
commit 3c2179fea9
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
packaging/android/build.sh
View file

@ -283,9 +283,10 @@ else
ANT=/usr/bin/ant ANT=/usr/bin/ant
FTDI=ON FTDI=ON
fi fi
PKGCONF=$(which pkg-config)
cmake $MOBILE_CMAKE \ cmake $MOBILE_CMAKE \
-DQT_ANDROID_ANT=${ANT} \ -DQT_ANDROID_ANT=${ANT} \
-DPKG_CONFIG_EXECUTABLE=/usr/bin/pkg-config \ -DPKG_CONFIG_EXECUTABLE=${PKGCONF} \
-DQT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT \ -DQT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT \
-DQT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT \ -DQT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT \
-DCMAKE_TOOLCHAIN_FILE=$BUILDROOT/qt-android-cmake/toolchain/android.toolchain.cmake \ -DCMAKE_TOOLCHAIN_FILE=$BUILDROOT/qt-android-cmake/toolchain/android.toolchain.cmake \