[PATCH 1/3] Remove defaults for Android from cmake

[Sebastian Kügler]

>From a cursory glance, patches look good to me.

On Tuesday, December 01, 2015 08:46:58 PM Anton Lundin wrote:
> 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 at acc.umu.se>
> ---
>  CMakeLists.txt             | 5 -----
>  packaging/android/build.sh | 1 +
>  2 files changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index dd47be5..7adb2ce 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 c3efa5b..b03bfef 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/cm
> ake \ -DCMAKE_BUILD_TYPE=Debug \
>  	-DFTDISUPPORT=${FTDI} \

-- 
sebas

http://www.kde.org | http://vizZzion.org