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

looks like Maksim was right; the new fix does not do the second attempt to detect python libs, it finds it correctly with the first attempt

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-03-06 16:57:38 +03:00
parent 4aa6d10a60
commit 643bbb2d93
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/OpenCVDetectPython.cmake
View File

@@ -75,10 +75,10 @@ function(find_python preferred_version min_version library_env include_dir_env
if(NOT ANDROID AND NOT IOS) if(NOT ANDROID AND NOT IOS)
ocv_check_environment_variables(${library_env} ${include_dir_env}) ocv_check_environment_variables(${library_env} ${include_dir_env})
if(${library_env}) if(${${library_env}})
set(PYTHON_LIBRARY "${${library_env}}") set(PYTHON_LIBRARY "${${library_env}}")
endif() endif()
if(${include_dir_env}) if(${${include_dir_env}})
set(PYTHON_INCLUDE_DIR "${${include_dir_env}}") set(PYTHON_INCLUDE_DIR "${${include_dir_env}}")
endif() endif()
@@ -88,9 +88,6 @@ function(find_python preferred_version min_version library_env include_dir_env
find_host_package(PythonLibs "${_version_major_minor}") find_host_package(PythonLibs "${_version_major_minor}")
else() else()
find_host_package(PythonLibs "${_version_major_minor}.${_version_patch}" EXACT) find_host_package(PythonLibs "${_version_major_minor}.${_version_patch}" EXACT)
if(NOT PYTHONLIBS_FOUND)
find_host_package(PythonLibs "${_version_major_minor}.${_version_patch}")
endif()
endif() endif()
if(PYTHONLIBS_FOUND) if(PYTHONLIBS_FOUND)