diff options
| author |  Joakim Bygdell <j.bygdell@gmail.com> | 2016-08-16 09:08:34 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-08-17 21:29:05 -0700 |
| commit | 925fd8d4c1e18ecc5d4826fc70c16635f6fbf048 (patch) | |
| tree | 1cf19399f776e98e72dee5551d5ea82099cab3a0 /packaging/android | |
| parent | 59e53ae4cc428d69c8940c43be3f8b7e4c7cb4d8 (diff) | |
| download | subsurface-925fd8d4c1e18ecc5d4826fc70c16635f6fbf048.tar.gz | |
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 <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/android')
| -rw-r--r-- | packaging/android/build.sh | 11 |
1 files changed, 5 insertions, 6 deletions
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 |