Remove defaults for Android from cmake

Some of the flags needed to build for android was set in cmake. There
are many more that needs to be set correctly for things to work, so
having some in cmake and some in the Android build.sh is just confusing.

This removes the bits from cmake and moves everything into build.sh.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2015-12-01 20:46:58 +01:00 committed by Dirk Hohndel
parent 63eff39edd
commit 58901690dd
2 changed files with 1 additions and 5 deletions

View file

@ -158,11 +158,6 @@ if(FTDISUPPORT)
add_definitions(-DSERIAL_FTDI)
endif()
if(ANDROID)
set(FBSUPPORT OFF)
set(NO_PRINTING ON)
endif()
# setup Grantlee
if(NO_PRINTING)

View file

@ -298,6 +298,7 @@ cmake $MOBILE_CMAKE \
-DNO_MARBLE=ON \
-DNO_PRINTING=ON \
-DNO_USERMANUAL=ON \
-DFBSUPPORT=OFF \
-DCMAKE_PREFIX_PATH:UNINITIALIZED=${QT5_ANDROID}/android_${QT_ARCH}/lib/cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DFTDISUPPORT=${FTDI} \