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

2012-06-28 17:07:17 +00:00
parent b156e2f7ed
commit 162f9fd7ea
61 changed files with 2738 additions and 1726 deletions
--- a/cmake/OpenCVDetectPython.cmake
+++ b/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)