generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug with ARM_TARGET caching

Browse Source
This commit is contained in:
Andrey Kamaev 2011-07-12 16:22:52 +00:00
parent 6623fe3b08
commit bee4c347ba
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/android.toolchain.cmake
View File

@ -221,13 +221,15 @@ set( CMAKE_RANLIB ${ANDROID_NDK_TOOLCHAIN_ROOT}/bin/arm-linux-androideabi-
#setup build targets, mutually exclusive #setup build targets, mutually exclusive
set( PossibleArmTargets "armeabi;armeabi-v7a;armeabi-v7a with NEON;armeabi-v7a with VFPV3" ) 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 #compatibility junk for previous version of toolchain
if( DEFINED ARM_TARGETS AND NOT DEFINED ARM_TARGET ) if( DEFINED ARM_TARGETS AND NOT DEFINED ARM_TARGET )
SET( ARM_TARGET "${ARM_TARGETS}" ) set( ARM_TARGET "${ARM_TARGETS}" )
endif() 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 #set these flags for client use
if( ARM_TARGET STREQUAL "armeabi" ) if( ARM_TARGET STREQUAL "armeabi" )