[PATCH 3/4] Android: ask which pkg-config to use
Joakim Bygdell
j.bygdell at gmail.com
Sun Nov 8 07:50:50 PST 2015
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 at gmail.com>
---
packaging/android/build.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index ba724cd..c3efa5b 100644
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -283,9 +283,10 @@ else
ANT=/usr/bin/ant
FTDI=ON
fi
+PKGCONF=$(which pkg-config)
cmake $MOBILE_CMAKE \
-DQT_ANDROID_ANT=${ANT} \
- -DPKG_CONFIG_EXECUTABLE=/usr/bin/pkg-config \
+ -DPKG_CONFIG_EXECUTABLE=${PKGCONF} \
-DQT_ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT \
-DQT_ANDROID_NDK_ROOT=$ANDROID_NDK_ROOT \
-DCMAKE_TOOLCHAIN_FILE=$BUILDROOT/qt-android-cmake/toolchain/android.toolchain.cmake \
--
2.4.9 (Apple Git-60)
More information about the subsurface
mailing list