generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3212 from mshabunin:python_cross_build_2.4

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-09-18 08:57:32 +00:00
commit 26fd37b27d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/OpenCVDetectPython.cmake
View File

@ -38,7 +38,9 @@ if(PYTHON_EXECUTABLE)
if(NOT ANDROID AND NOT IOS) if(NOT ANDROID AND NOT IOS)
ocv_check_environment_variables(PYTHON_LIBRARY PYTHON_INCLUDE_DIR) 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) find_host_package(PythonLibs ${PYTHON_VERSION_FULL} EXACT)
else() else()
find_host_package(PythonLibs ${PYTHON_VERSION_FULL}) find_host_package(PythonLibs ${PYTHON_VERSION_FULL})