From 58901690dd1d6e8c7bbfc5099f43bfa8f9a955b8 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Tue, 1 Dec 2015 20:46:58 +0100 Subject: 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 Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 5 ----- packaging/android/build.sh | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c34efb32c..c53846788 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/packaging/android/build.sh b/packaging/android/build.sh index c3efa5bf1..b03bfef19 100644 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -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} \ -- cgit v1.2.3-70-g09d2