Merge pull request #12 from xsacha/hunter-3.0.0

Rename ANDROID_ vars to CMAKE_ vars.

Author: ruslo

3rdparty/ippicv/downloader.cmake

@@ -13,7 +13,7 @@ function(_icv_downloader)
     set(OPENCV_ICV_PLATFORM "macosx")
     set(OPENCV_ICV_PACKAGE_SUBDIR "/ippicv_osx")
   elseif(UNIX)
-    if(ANDROID AND (NOT ANDROID_ABI STREQUAL x86))
+    if(ANDROID AND (NOT CMAKE_ANDROID_ARCH STREQUAL x86))
       return()
     endif()
     set(OPENCV_ICV_PACKAGE_NAME "ippicv_linux_20141027.tgz")

CMakeLists.txt

@@ -87,8 +87,8 @@ endif()
 
 include("cmake/HunterGate.cmake")
 HunterGate(
-    URL "https://github.com/ruslo/hunter/archive/v0.16.24.tar.gz"
-    SHA1 "00ab627d3d4fe5151e15b6ab2b1b1da17650984a"
+    URL "https://github.com/ruslo/hunter/archive/v0.18.1.tar.gz"
+    SHA1 "c1aa0ef5191e4484889866c62263a64f1ee61d3e"
 )
 
 project(OpenCV CXX C)
@@ -300,12 +300,9 @@ include(cmake/OpenCVVersion.cmake)
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Output directory for applications" )
 
 if (ANDROID)
-  if (ANDROID_ABI MATCHES "NEON")
+  if (CMAKE_ANDROID_ARM_NEON)
     set(ENABLE_NEON ON)
   endif()
-  if (ANDROID_ABI MATCHES "VFPV3")
-    set(ENABLE_VFPV3 ON)
-  endif()
 endif()
 
 if(ANDROID OR WIN32)
@@ -812,16 +809,12 @@ status("    Unavailable:"            OPENCV_MODULES_DISABLED_FORCE THEN ${OPENCV
 if(ANDROID)
   status("")
   status("  Android: ")
-  status("    Android ABI:" ${ANDROID_ABI})
+  status("    Android ABI:" ${CMAKE_ANDROID_ARCH_ABI})
   status("    STL type:" ${ANDROID_STL})
-  status("    Native API level:" android-${ANDROID_NATIVE_API_LEVEL})
-  android_get_compatible_target(android_sdk_target_status ${ANDROID_NATIVE_API_LEVEL} ${ANDROID_SDK_TARGET} 11)
+  status("    Native API level:" android-${CMAKE_SYSTEM_VERSION})
+  android_get_compatible_target(android_sdk_target_status ${CMAKE_SYSTEM_VERSION} ${ANDROID_SDK_TARGET} 11)
   status("    SDK target:" "${android_sdk_target_status}")
-  if(BUILD_WITH_ANDROID_NDK)
-    status("    Android NDK:" "${ANDROID_NDK} (toolchain: ${ANDROID_TOOLCHAIN_NAME})")
-  elseif(BUILD_WITH_STANDALONE_TOOLCHAIN)
-    status("    Android toolchain:" "${ANDROID_STANDALONE_TOOLCHAIN}")
-  endif()
+  status("    Android NDK:" "${CMAKE_ANDROID_NDK} (toolchain: ${CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION})")
   status("    android tool:"  ANDROID_EXECUTABLE  THEN "${ANDROID_EXECUTABLE} (${ANDROID_TOOLS_Pkg_Desc})" ELSE NO)
   status("    Google Play manager:" BUILD_ANDROID_SERVICE                                         THEN YES ELSE NO)
   status("    Android examples:"    BUILD_ANDROID_EXAMPLES AND CAN_BUILD_ANDROID_PROJECTS         THEN YES ELSE NO)

cmake/OpenCVDetectAndroidSDK.cmake

@@ -199,10 +199,10 @@ macro(add_android_project target path)
   endforeach()
 
   # get compatible SDK target
-  android_get_compatible_target(android_proj_sdk_target ${ANDROID_NATIVE_API_LEVEL} ${android_proj_SDK_TARGET})
+  android_get_compatible_target(android_proj_sdk_target ${CMAKE_SYSTEM_VERSION} ${android_proj_SDK_TARGET})
 
   if(NOT android_proj_sdk_target)
-    message(WARNING "Can not find any SDK target compatible with: ${ANDROID_NATIVE_API_LEVEL} ${android_proj_SDK_TARGET}
+    message(WARNING "Can not find any SDK target compatible with: ${CMAKE_SYSTEM_VERSION} ${android_proj_SDK_TARGET}
                      The project ${target} will not be build")
   endif()
 
@@ -217,7 +217,7 @@ macro(add_android_project target path)
     # find if native_app_glue is used
     file(STRINGS "${path}/jni/Android.mk" NATIVE_APP_GLUE REGEX ".*(call import-module,android/native_app_glue)" )
     if(NATIVE_APP_GLUE)
-      if(ANDROID_NATIVE_API_LEVEL LESS 9 OR NOT EXISTS "${ANDROID_NDK}/sources/android/native_app_glue")
+      if(CMAKE_SYSTEM_VERSION LESS 9 OR NOT EXISTS "${CMAKE_ANDROID_NDK}/sources/android/native_app_glue")
         set(OCV_DEPENDENCIES_FOUND FALSE)
       endif()
     endif()
@@ -281,8 +281,8 @@ macro(add_android_project target path)
 
       if(JNI_LIB_NAME)
         if(NATIVE_APP_GLUE)
-          include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
-          list(APPEND android_proj_jni_files ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
+          include_directories(${CMAKE_ANDROID_NDK}/sources/android/native_app_glue)
+          list(APPEND android_proj_jni_files ${CMAKE_ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
           ocv_warnings_disable(CMAKE_C_FLAGS -Wstrict-prototypes -Wunused-parameter -Wmissing-prototypes)
           set(android_proj_NATIVE_DEPS ${android_proj_NATIVE_DEPS} android)
         endif()

cmake/OpenCVFindLibsGrfmt.cmake

@@ -9,8 +9,8 @@ else()
   hunter_add_package(ZLIB)
   find_package(ZLIB "${MIN_VER_ZLIB}")
   if(ZLIB_FOUND AND ANDROID)
-    if(ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib/libz.so" OR
-        ZLIB_LIBRARIES STREQUAL "${ANDROID_SYSROOT}/usr/lib64/libz.so")
+    if(ZLIB_LIBRARIES STREQUAL "${CMAKE_SYSROOT}/usr/lib/libz.so" OR
+       ZLIB_LIBRARIES STREQUAL "${CMAKE_SYSROOT}/usr/lib64/libz.so")
       set(ZLIB_LIBRARIES z)
     endif()
   endif()

cmake/OpenCVGenConfig.cmake

@@ -19,10 +19,10 @@ else()
   set(OpenCV_CUDA_VERSION ${CUDA_VERSION_STRING})
 endif()
 
-if(NOT ANDROID_NATIVE_API_LEVEL)
+if(ANDROID AND NOT CMAKE_SYSTEM_VERSION)
   set(OpenCV_ANDROID_NATIVE_API_LEVEL_CONFIGCMAKE 0)
 else()
-  set(OpenCV_ANDROID_NATIVE_API_LEVEL_CONFIGCMAKE "${ANDROID_NATIVE_API_LEVEL}")
+  set(OpenCV_ANDROID_NATIVE_API_LEVEL_CONFIGCMAKE "${CMAKE_SYSTEM_VERSION}")
 endif()
 
 if(CMAKE_GENERATOR MATCHES "Visual" OR CMAKE_GENERATOR MATCHES "Xcode")

cmake/templates/OpenCVConfig.cmake.in

@@ -194,7 +194,7 @@ endif()
 # ==============================================================
 #  Check OpenCV availability
 # ==============================================================
-if(ANDROID AND OpenCV_ANDROID_NATIVE_API_LEVEL GREATER ANDROID_NATIVE_API_LEVEL)
+if(ANDROID AND OpenCV_ANDROID_NATIVE_API_LEVEL GREATER CMAKE_SYSTEM_VERSION)
   message(FATAL_ERROR "Minimum required by OpenCV API level is android-${OpenCV_ANDROID_NATIVE_API_LEVEL}")
   #always FATAL_ERROR because we can't say to the caller that OpenCV is not found
   #http://www.mail-archive.com/[email protected]/msg37831.html

modules/java/CMakeLists.txt

@@ -1,7 +1,7 @@
 # ----------------------------------------------------------------------------
 #  CMake file for java support
 # ----------------------------------------------------------------------------
-if(IOS OR WINRT OR NOT PYTHON_DEFAULT_AVAILABLE OR NOT ANT_EXECUTABLE OR NOT (JNI_FOUND OR (ANDROID AND ANDROID_NATIVE_API_LEVEL GREATER 7))
+if(IOS OR WINRT OR NOT PYTHON_DEFAULT_AVAILABLE OR NOT ANT_EXECUTABLE OR NOT (JNI_FOUND OR (ANDROID AND CMAKE_SYSTEM_VERSION GREATER 7))
     OR BUILD_opencv_world
     )
   ocv_module_disable(java)
@@ -252,7 +252,7 @@ if(ANDROID AND ANDROID_EXECUTABLE)
   set(lib_target_files ${ANDROID_LIB_PROJECT_FILES})
   ocv_list_add_prefix(lib_target_files "${OpenCV_BINARY_DIR}/")
 
-  android_get_compatible_target(lib_target_sdk_target ${ANDROID_NATIVE_API_LEVEL} ${ANDROID_SDK_TARGET} 14)
+  android_get_compatible_target(lib_target_sdk_target ${CMAKE_SYSTEM_VERSION} ${ANDROID_SDK_TARGET} 14)
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/android_lib/${ANDROID_MANIFEST_FILE}" "${CMAKE_CURRENT_BINARY_DIR}/${ANDROID_MANIFEST_FILE}" @ONLY)
 
   add_custom_command(OUTPUT ${lib_target_files} "${OpenCV_BINARY_DIR}/${ANDROID_MANIFEST_FILE}"

modules/ts/misc/run.py

@@ -67,9 +67,9 @@
   {'name': "opencv_cxx_flags",         'default': "",         'pattern': re.compile("^OPENCV_EXTRA_C_FLAGS:INTERNAL=(.*)$")},
   {'name': "opencv_cxx_flags_debug",   'default': "",         'pattern': re.compile("^OPENCV_EXTRA_C_FLAGS_DEBUG:INTERNAL=(.*)$")},
   {'name': "opencv_cxx_flags_release", 'default': "",         'pattern': re.compile("^OPENCV_EXTRA_C_FLAGS_RELEASE:INTERNAL=(.*)$")},
-  {'name': "cxx_flags_android",        'default': None,       'pattern': re.compile("^ANDROID_CXX_FLAGS:INTERNAL=(.*)$")},
-  {'name': "ndk_path",                 'default': None,       'pattern': re.compile("^(?:ANDROID_NDK|ANDROID_STANDALONE_TOOLCHAIN)?:PATH=(.*)$")},
-  {'name': "android_abi",              'default': None,       'pattern': re.compile("^ANDROID_ABI:STRING=(.*)$")},
+  {'name': "cxx_flags_android",        'default': None,       'pattern': re.compile("^CMAKE_CXX_FLAGS:INTERNAL=(.*)$")},
+  {'name': "ndk_path",                 'default': None,       'pattern': re.compile("^(?:CMAKE_ANDROID_NDK)?:PATH=(.*)$")},
+  {'name': "android_abi",              'default': None,       'pattern': re.compile("^CMAKE_ANDROID_ARCH_ABI:STRING=(.*)$")},
   {'name': "android_executable",       'default': None,       'pattern': re.compile("^ANDROID_EXECUTABLE:FILEPATH=(.*android.*)$")},
   {'name': "ant_executable",           'default': None,       'pattern': re.compile("^ANT_EXECUTABLE:FILEPATH=(.*ant.*)$")},
   {'name': "java_test_binary_dir",     'default': None,       'pattern': re.compile("^opencv_test_java_BINARY_DIR:STATIC=(.*)$")},