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

Fixed cmake configuration for Android for case when only one SDK target is available #1781

Browse Source
This commit is contained in:
Andrey Kamaev 2012-04-09 14:51:14 +00:00
parent 2a626e1a2d
commit f7853b262b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -655,7 +655,7 @@ include(cmake/OpenCVGenConfig.cmake REQUIRED)
status("") status("")
status("General configuration for OpenCV ${OPENCV_VERSION} =====================================") status("General configuration for OpenCV ${OPENCV_VERSION} =====================================")
if(OPENCV_SVNVERSION) if(OPENCV_SVNVERSION)
status("svn:" "${OPENCV_SVNVERSION}") status("Version control:" ${OPENCV_SVNVERSION})
endif() endif()
#build platform #build platform

3
cmake/OpenCVDetectAndroidSDK.cmake
View File

@ -127,7 +127,6 @@ if(ANDROID_EXECUTABLE)
if(ANDROID_SDK_TARGETS AND CMAKE_VERSION VERSION_GREATER "2.8") if(ANDROID_SDK_TARGETS AND CMAKE_VERSION VERSION_GREATER "2.8")
set_property( CACHE ANDROID_SDK_TARGET PROPERTY STRINGS ${ANDROID_SDK_TARGETS} ) set_property( CACHE ANDROID_SDK_TARGET PROPERTY STRINGS ${ANDROID_SDK_TARGETS} )
endif() endif()
endif(ANDROID_EXECUTABLE) endif(ANDROID_EXECUTABLE)
# finds minimal installed SDK target compatible with provided names or API levels # finds minimal installed SDK target compatible with provided names or API levels
@ -136,7 +135,7 @@ endif(ANDROID_EXECUTABLE)
macro(android_get_compatible_target VAR) macro(android_get_compatible_target VAR)
set(${VAR} "${VAR}-NOTFOUND") set(${VAR} "${VAR}-NOTFOUND")
if(ANDROID_SDK_TARGETS) if(ANDROID_SDK_TARGETS)
list(GET ANDROID_SDK_TARGETS 1 __lvl) list(GET ANDROID_SDK_TARGETS 0 __lvl)
string(REGEX MATCH "[0-9]+$" __lvl "${__lvl}") string(REGEX MATCH "[0-9]+$" __lvl "${__lvl}")
#find minimal level mathing to all provided levels #find minimal level mathing to all provided levels