mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4196 from alalek:fix_python

Browse Source
This commit is contained in:
Maksim Shabunin 2015-07-24 11:43:00 +00:00
commit be70df1187
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/OpenCVDetectPython.cmake
View File

@ -85,9 +85,9 @@ function(find_python preferred_version min_version library_env include_dir_env
# 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) if(CMAKE_CROSSCOMPILING)
# builder version can differ from target, matching base version (e.g. 2.7) # builder version can differ from target, matching base version (e.g. 2.7)
find_host_package(PythonLibs "${_version_major_minor}") find_package(PythonLibs "${_version_major_minor}")
else() else()
find_host_package(PythonLibs "${_version_major_minor}.${_version_patch}" EXACT) find_package(PythonLibs "${_version_major_minor}.${_version_patch}" EXACT)
endif() endif()
if(PYTHONLIBS_FOUND) if(PYTHONLIBS_FOUND)
@ -105,7 +105,7 @@ function(find_python preferred_version min_version library_env include_dir_env
set(_include_dir ${PYTHON_INCLUDE_DIR}) set(_include_dir ${PYTHON_INCLUDE_DIR})
set(_include_dir2 ${PYTHON_INCLUDE_DIR2}) set(_include_dir2 ${PYTHON_INCLUDE_DIR2})
# Clear find_host_package side effects # Clear find_package side effects
unset(PYTHONLIBS_FOUND) unset(PYTHONLIBS_FOUND)
unset(PYTHON_LIBRARIES) unset(PYTHON_LIBRARIES)
unset(PYTHON_INCLUDE_PATH) unset(PYTHON_INCLUDE_PATH)