Merge pull request #3212 from mshabunin:python_cross_build_2.4

26fd37b2 · Vadim Pisarevsky · ccaedaed · 1b4e3ec3 · 26fd37b2
Commit 26fd37b2 authored Sep 18, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

OpenCVDetectPython.cmake cmake/OpenCVDetectPython.cmake +3 -1

No files found.
--- a/cmake/OpenCVDetectPython.cmake
+++ b/cmake/OpenCVDetectPython.cmake
@@ -38,7 +38,9 @@ if(PYTHON_EXECUTABLE)

  if(NOT ANDROID AND NOT IOS)
    ocv_check_environment_variables(PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
-    if(CMAKE_VERSION VERSION_GREATER 2.8.8 AND PYTHON_VERSION_FULL)
+    if(CMAKE_CROSSCOMPILING)
+      find_host_package(PythonLibs ${PYTHON_VERSION_MAJOR_MINOR})
+    elseif(CMAKE_VERSION VERSION_GREATER 2.8.8 AND PYTHON_VERSION_FULL)
      find_host_package(PythonLibs ${PYTHON_VERSION_FULL} EXACT)
    else()
      find_host_package(PythonLibs ${PYTHON_VERSION_FULL})