mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 12:10:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3189 from mshabunin:python_cross_build

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-09-10 07:57:09 +00:00
commit 71edf1b5f1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/OpenCVDetectPython.cmake
View File

@ -83,7 +83,12 @@ function(find_python preferred_version min_version library_env include_dir_env
endif() endif()
# not using _version_string here, because it might not conform to the CMake version format # not using _version_string here, because it might not conform to the CMake version format
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) find_host_package(PythonLibs "${_version_major_minor}.${_version_patch}" EXACT)
endif()
if(PYTHONLIBS_FOUND) if(PYTHONLIBS_FOUND)
# Copy outputs # Copy outputs