#1508 prefer architecture-specific install directory for python bindings, when LIB_SUFFIX is used

cmake/OpenCVDetectPython.cmake

@@ -17,28 +17,35 @@ if(PYTHON_EXECUTABLE)
     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
   string(REGEX MATCH "[0-9]+.[0-9]+" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
-  if(CMAKE_HOST_UNIX)
+
-    execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print get_python_lib()"
+  if(NOT ANDROID AND NOT IOS)
-                    RESULT_VARIABLE PYTHON_CVPY_PROCESS
+    if(CMAKE_HOST_UNIX)
-                    OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
+      execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print get_python_lib()"
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+                      RESULT_VARIABLE PYTHON_CVPY_PROCESS
-    if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages")
+                      OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
-      set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)
-    else() #debian based assumed, install to the dist-packages.
+      if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages")
-      set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
+        set(PYTHON_PACKAGES_PATH "python${PYTHON_VERSION_MAJOR_MINOR}/site-packages")
-    endif()
+      else() #debian based assumed, install to the dist-packages.
-  elseif(CMAKE_HOST_WIN32)
+        set(PYTHON_PACKAGES_PATH "python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages")
-    get_filename_component(PYTHON_PATH "${PYTHON_EXECUTABLE}" PATH)
+      endif()
-    file(TO_CMAKE_PATH "${PYTHON_PATH}" PYTHON_PATH)
+      if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${PYTHON_PACKAGES_PATH}")
-    if(NOT EXISTS "${PYTHON_PATH}/Lib/site-packages")
+        set(PYTHON_PACKAGES_PATH "lib${LIB_SUFFIX}/${PYTHON_PACKAGES_PATH}")
-      unset(PYTHON_PATH)
+      else()
-      get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE)
+        set(PYTHON_PACKAGES_PATH "lib/${PYTHON_PACKAGES_PATH}")
+      endif()
+      set(PYTHON_PACKAGES_PATH "${PYTHON_PACKAGES_PATH}" CACHE PATH "Where to install the python packages.")
+    elseif(CMAKE_HOST_WIN32)
+      get_filename_component(PYTHON_PATH "${PYTHON_EXECUTABLE}" PATH)
       file(TO_CMAKE_PATH "${PYTHON_PATH}" PYTHON_PATH)
+      if(NOT EXISTS "${PYTHON_PATH}/Lib/site-packages")
+        unset(PYTHON_PATH)
+        get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE)
+        file(TO_CMAKE_PATH "${PYTHON_PATH}" PYTHON_PATH)
+      endif()
+      set(PYTHON_PACKAGES_PATH "${PYTHON_PATH}/Lib/site-packages")
     endif()
-    set(PYTHON_PACKAGES_PATH "${PYTHON_PATH}/Lib/site-packages")
-  endif()
 
-  if(NOT ANDROID AND NOT IOS)
     # Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
     execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]"
                     RESULT_VARIABLE PYTHON_NUMPY_PROCESS
@@ -52,7 +59,7 @@ if(PYTHON_EXECUTABLE)
       ocv_include_directories(${PYTHON_NUMPY_INCLUDE_DIRS})
       message(STATUS "    Use NumPy headers from: ${PYTHON_NUMPY_INCLUDE_DIRS}")
     endif()
-  endif()
+  endif(NOT ANDROID AND NOT IOS)
 
   if(BUILD_DOCS)
     # look for Sphinx