From bee4c347ba5e819ad2c4ec9f3e32125fbe573e01 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 12 Jul 2011 16:22:52 +0000 Subject: [PATCH] Fixed bug with ARM_TARGET caching --- android/android.toolchain.cmake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/android/android.toolchain.cmake b/android/android.toolchain.cmake index b10c526..f5c836f 100644 --- a/android/android.toolchain.cmake +++ b/android/android.toolchain.cmake @@ -221,13 +221,15 @@ set( CMAKE_RANLIB ${ANDROID_NDK_TOOLCHAIN_ROOT}/bin/arm-linux-androideabi- #setup build targets, mutually exclusive set( PossibleArmTargets "armeabi;armeabi-v7a;armeabi-v7a with NEON;armeabi-v7a with VFPV3" ) -set( ARM_TARGET "armeabi-v7a" CACHE INTERNAL "the arm target for android, recommend armeabi-v7a for floating point support and NEON." ) -set_property( CACHE ARM_TARGET PROPERTY STRINGS ${PossibleArmTargets} ) - #compatibility junk for previous version of toolchain if( DEFINED ARM_TARGETS AND NOT DEFINED ARM_TARGET ) - SET( ARM_TARGET "${ARM_TARGETS}" ) + set( ARM_TARGET "${ARM_TARGETS}" ) endif() +IF( NOT ARM_TARGET) + set( ARM_TARGET armeabi-v7a ) +ENDIF() +set( ARM_TARGET "${ARM_TARGET}" CACHE INTERNAL "the arm target for android, recommend armeabi-v7a for floating point support and NEON." ) +set_property( CACHE ARM_TARGET PROPERTY STRINGS ${PossibleArmTargets} ) #set these flags for client use if( ARM_TARGET STREQUAL "armeabi" ) -- 2.7.4