From: Andrey Kamaev <no@email>
Date: Tue, 12 Jul 2011 16:22:52 +0000 (+0000)
Subject: Fixed bug with ARM_TARGET caching
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~6656
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bee4c347ba5e819ad2c4ec9f3e32125fbe573e01;p=platform%2Fupstream%2Fopencv.git

Fixed bug with ARM_TARGET caching
---

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" )