merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811

cmake/OpenCVDetectAndroidSDK.cmake

@@ -215,7 +215,7 @@ macro(add_android_project target path)
 
     project(${target})
     set(android_proj_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/.build")
-   
+
     # get project sources
     file(GLOB_RECURSE android_proj_files RELATIVE "${path}" "${path}/res/*" "${path}/src/*")
     ocv_list_filterout(android_proj_files ".svn")
@@ -278,8 +278,6 @@ macro(add_android_project target path)
         get_target_property(android_proj_jni_location "${JNI_LIB_NAME}" LOCATION)
         add_custom_command(TARGET ${JNI_LIB_NAME} POST_BUILD COMMAND ${CMAKE_STRIP} --strip-unneeded "${android_proj_jni_location}")
       endif()
-    else()
-      unset(JNI_LIB_NAME)
     endif()
 
     # build java part
@@ -302,6 +300,8 @@ macro(add_android_project target path)
        DEPENDS ${android_proj_file_deps} ${JNI_LIB_NAME})
     endif()
 
+    unset(JNI_LIB_NAME)
+
     add_custom_target(${target} ALL SOURCES "${android_proj_bin_dir}/bin/${target}-debug.apk" )
     if(NOT android_proj_IGNORE_JAVA)
       add_dependencies(${target} opencv_java)

cmake/OpenCVDetectPython.cmake

@@ -30,7 +30,11 @@ if(PYTHON_EXECUTABLE)
   endif()
   
   if(NOT ANDROID AND NOT IOS)
-    find_host_package(PythonLibs ${PYTHON_VERSION_FULL})
+    if(CMAKE_VERSION VERSION_GREATER 2.8.8)
+      find_host_package(PythonLibs ${PYTHON_VERSION_FULL} EXACT)
+    else()
+      find_host_package(PythonLibs ${PYTHON_VERSION_FULL})
+    endif()
     # cmake 2.4 (at least on Ubuntu 8.04 (hardy)) don't define PYTHONLIBS_FOUND
     if(NOT PYTHONLIBS_FOUND AND PYTHON_INCLUDE_PATH)
       set(PYTHONLIBS_FOUND ON)

cmake/OpenCVFindLibsGrfmt.cmake

@@ -7,11 +7,11 @@ if(BUILD_ZLIB)
   ocv_clear_vars(ZLIB_FOUND)
 else()
   include(FindZLIB)
+  if(ZLIB_VERSION_STRING)
+    #cmake 2.8.2 bug - it fails to determine zlib version
+    unset(ZLIB_VERSION_STRING CACHE)
+  endif()
   if(ZLIB_FOUND)
-    if(ZLIB_VERSION_STRING)
-      #cmake 2.8.2 bug - it fails to determine zlib version
-      unset(ZLIB_VERSION_STRING CACHE)
-    endif()
     ocv_parse_header2(ZLIB "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_VERSION "")
   endif()
   if(ZLIB_FOUND AND ANDROID)

cmake/OpenCVFindXimea.cmake

@@ -8,6 +8,7 @@
 #  XIMEA_LIBRARY_DIR    - XIMEA libraries folder
 #
 # Created: 5 Aug 2011 by Marian Zajko (marian.zajko@ximea.com)
+# Updated: 25 June 2012 by Igor Kuzmin (parafin@ximea.com)
 #
 
 set(XIMEA_FOUND)
@@ -20,10 +21,16 @@ if(WIN32)
 
   if(EXISTS XIMEA_PATH)
     set(XIMEA_FOUND 1)
-
     # set LIB folders
-    set(XIMEA_LIBRARY_DIR "${XIMEA_PATH}\\x86")
-
+    set(XIMEA_LIBRARY_DIR "${XIMEA_PATH}/x86")
+  else()
+    set(XIMEA_FOUND 0)
+  endif()
+else()
+  if(EXISTS /opt/XIMEA)
+    set(XIMEA_FOUND 1)
+    # set folders
+    set(XIMEA_PATH /opt/XIMEA/include)
   else()
     set(XIMEA_FOUND 0)
   endif()