Merge pull request #3189 from mshabunin:python_cross_build

11 years ago · 71edf1b5f1
parent 2e950eb41b 2c2cdcf789
commit 71edf1b5f1
1 changed files with 6 additions and 1 deletions
--- a/cmake/OpenCVDetectPython.cmake
+++ b/cmake/OpenCVDetectPython.cmake
@ -83,7 +83,12 @@ function(find_python preferred_version min_version library_env include_dir_env
      endif()

      # not using _version_string here, because it might not conform to the CMake version format
-      find_host_package(PythonLibs "${_version_major_minor}.${_version_patch}" EXACT)
+      if(CMAKE_CROSSCOMPILING)
+        # builder version can differ from target, matching base version (e.g. 2.7)
+        find_host_package(PythonLibs "${_version_major_minor}")
+      else()
+        find_host_package(PythonLibs "${_version_major_minor}.${_version_patch}" EXACT)
+      endif()

      if(PYTHONLIBS_FOUND)
        # Copy outputs