potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Fixed some cmake 2.6 compatibility issues.

Browse Source
This commit is contained in:
Andrey Kamaev
2011-09-18 15:30:36 +00:00
parent 1554d7ab65
commit fb2c288627
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/android.toolchain.cmake
+6 -2
View File
@@ -172,7 +172,9 @@ if( EXISTS "${ANDROID_NDK}" )
set( PossibleAndroidLevels "3;4;5;8;9" )
set( ANDROID_API_LEVEL ${ANDROID_API_LEVEL} CACHE STRING "android API level" )
set_property( CACHE ANDROID_API_LEVEL PROPERTY STRINGS ${PossibleAndroidLevels} )
if( CMAKE_VERSION VERSION_GREATER "2.8")
set_property( CACHE ANDROID_API_LEVEL PROPERTY STRINGS ${PossibleAndroidLevels} )
endif()
if( NOT ANDROID_API_LEVEL GREATER 2 )
set( ANDROID_API_LEVEL 8)
@@ -237,7 +239,9 @@ 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} )
if( CMAKE_VERSION VERSION_GREATER "2.8")
set_property( CACHE ARM_TARGET PROPERTY STRINGS ${PossibleArmTargets} )
endif()
#set these flags for client use
if( ARM_TARGET STREQUAL "armeabi" )