From f7853b262bd72defc288d63c3bd1eaba59109893 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 9 Apr 2012 14:51:14 +0000 Subject: [PATCH] Fixed cmake configuration for Android for case when only one SDK target is available #1781 --- CMakeLists.txt | 2 +- cmake/OpenCVDetectAndroidSDK.cmake | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e7ff2d0..e9e5eea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -655,7 +655,7 @@ include(cmake/OpenCVGenConfig.cmake REQUIRED) status("") status("General configuration for OpenCV ${OPENCV_VERSION} =====================================") if(OPENCV_SVNVERSION) - status("svn:" "${OPENCV_SVNVERSION}") + status("Version control:" ${OPENCV_SVNVERSION}) endif() #build platform diff --git a/cmake/OpenCVDetectAndroidSDK.cmake b/cmake/OpenCVDetectAndroidSDK.cmake index a2397d4..6b79f8b 100644 --- a/cmake/OpenCVDetectAndroidSDK.cmake +++ b/cmake/OpenCVDetectAndroidSDK.cmake @@ -127,7 +127,6 @@ if(ANDROID_EXECUTABLE) if(ANDROID_SDK_TARGETS AND CMAKE_VERSION VERSION_GREATER "2.8") set_property( CACHE ANDROID_SDK_TARGET PROPERTY STRINGS ${ANDROID_SDK_TARGETS} ) endif() - endif(ANDROID_EXECUTABLE) # 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) set(${VAR} "${VAR}-NOTFOUND") 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}") #find minimal level mathing to all provided levels -- 2.7.4