From 925fd8d4c1e18ecc5d4826fc70c16635f6fbf048 Mon Sep 17 00:00:00 2001 From: Joakim Bygdell Date: Tue, 16 Aug 2016 09:08:34 +0200 Subject: Android build: compile kirigami Build kirkigami plugin out of source and make sure that we use the same QT version for the plugin and the app. Signed-off-by: Joakim Bygdell Signed-off-by: Dirk Hohndel --- packaging/android/build.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'packaging/android/build.sh') diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 5319c4d46..d844e8dca 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -316,13 +316,12 @@ if [ "$SUBSURFACE_MOBILE" = "ON" ] ; then pushd $SUBSURFACE_SOURCE bash ./scripts/mobilecomponents.sh popd - - cd $SUBSURFACE_SOURCE/mobile-widgets/qml/kirigami/ - mkdir -p build - cd build - cmake .. -DSTATIC_LIBRARY=ON + rm -rf kirigami-build + mkdir -p kirigami-build + pushd kirigami-build + cmake $SUBSURFACE_SOURCE/mobile-widgets/qml/kirigami/ -DSTATIC_LIBRARY=ON -DCMAKE_PREFIX_PATH:UNINITIALIZED=${QT5_ANDROID}/android_${QT_ARCH}/lib/cmake make -j4 - make install + popd fi if [ ! -z "$SUBSURFACE_MOBILE" ] ; then -- cgit v1.2.3-70-g09d2