From 7dd8a62ceddbb2205bd41260964f3450e72fccab Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 18 Aug 2016 21:38:13 -0700 Subject: Don't build Kirigami as a library Just link it directly into Subsurface-mobile. That's what we already do with the qmake file for iOS, now the cmake based builds do the same. This should remove a lot of issues. Signed-off-by: Dirk Hohndel --- packaging/android/build.sh | 6 ------ 1 file changed, 6 deletions(-) (limited to 'packaging') diff --git a/packaging/android/build.sh b/packaging/android/build.sh index d844e8dca..408a5467d 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -316,12 +316,6 @@ if [ "$SUBSURFACE_MOBILE" = "ON" ] ; then pushd $SUBSURFACE_SOURCE bash ./scripts/mobilecomponents.sh popd - 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 - popd fi if [ ! -z "$SUBSURFACE_MOBILE" ] ; then -- cgit v1.2.3-70-g09d2