1) make sure Python 2.7 is detected on Ubuntu (including libs) when it's there.

2) disable IPP on 32-bit Linux when OpenCV is built as shared libs. Otherwise we get linker errors
3) disable IPP's minMaxIdx 32-bit floating-point flavor in a hope that it fixes some test failures
This commit is contained in:
Vadim Pisarevsky
2015-03-05 18:58:54 +03:00
parent 0b99f6bcd6
commit 7a52c3d9f1
4 changed files with 10 additions and 2 deletions

View File

@@ -88,6 +88,9 @@ function(find_python preferred_version min_version library_env include_dir_env
find_host_package(PythonLibs "${_version_major_minor}")
else()
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()
if(PYTHONLIBS_FOUND)