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

ipp: disable compilation with IPP 9+

Browse Source
This commit is contained in:
Alexander Alekhin 2016-11-29 00:54:15 +03:00
parent 3d8395cae9
commit 2d28bb4171
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/OpenCVFindIPP.cmake
View File

@ -85,8 +85,6 @@ function(get_ipp_version _ROOT_DIR)
message(STATUS "found IPP: ${_MAJOR}.${_MINOR}.${_BUILD} [${_VERSION_STR}]") message(STATUS "found IPP: ${_MAJOR}.${_MINOR}.${_BUILD} [${_VERSION_STR}]")
message(STATUS "at: ${_ROOT_DIR}") message(STATUS "at: ${_ROOT_DIR}")
return()
endfunction() endfunction()
@ -129,8 +127,6 @@ function(set_ipp_old_libraries)
${IPP_LIB_PREFIX}${IPP_PREFIX}${IPPCORE}${IPP_ARCH}${IPP_SUFFIX}${IPP_LIB_SUFFIX} ${IPP_LIB_PREFIX}${IPP_PREFIX}${IPPCORE}${IPP_ARCH}${IPP_SUFFIX}${IPP_LIB_SUFFIX}
PARENT_SCOPE) PARENT_SCOPE)
return()
endfunction() endfunction()
@ -173,7 +169,6 @@ function(set_ipp_new_libraries _LATEST_VERSION)
${IPP_LIB_PREFIX}svml${CMAKE_SHARED_LIBRARY_SUFFIX}) ${IPP_LIB_PREFIX}svml${CMAKE_SHARED_LIBRARY_SUFFIX})
endif() endif()
set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE) set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE)
return()
endfunction() endfunction()
@ -208,7 +203,7 @@ function(set_ipp_variables _LATEST_VERSION)
set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE) set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE)
message(STATUS "IPP libs: ${IPP_LIBRARIES}") message(STATUS "IPP libs: ${IPP_LIBRARIES}")
else() elseif(${_LATEST_VERSION} VERSION_LESS "9.0")
# message(STATUS "new") # message(STATUS "new")
# set INCLUDE and LIB folders # set INCLUDE and LIB folders
@ -229,7 +224,10 @@ function(set_ipp_variables _LATEST_VERSION)
endif() endif()
if (UNIX) if (UNIX)
get_filename_component(INTEL_COMPILER_LIBRARY_DIR ${IPP_ROOT_DIR}/../lib REALPATH) get_filename_component(INTEL_COMPILER_LIBRARY_DIR ${IPP_ROOT_DIR}/../compiler/lib REALPATH)
if(NOT EXISTS "${INTEL_COMPILER_LIBRARY_DIR}")
get_filename_component(INTEL_COMPILER_LIBRARY_DIR ${IPP_ROOT_DIR}/../lib REALPATH)
endif()
if (IPP_X64) if (IPP_X64)
if(NOT EXISTS ${INTEL_COMPILER_LIBRARY_DIR}/intel64) if(NOT EXISTS ${INTEL_COMPILER_LIBRARY_DIR}/intel64)
message(SEND_ERROR "Intel compiler EM64T libraries not found") message(SEND_ERROR "Intel compiler EM64T libraries not found")
@ -253,10 +251,11 @@ function(set_ipp_variables _LATEST_VERSION)
set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE) set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE)
message(STATUS "IPP libs: ${IPP_LIBRARIES}") message(STATUS "IPP libs: ${IPP_LIBRARIES}")
else()
message(STATUS "IPP: version ${_LATEST_VERSION} is not supported (${IPP_ROOT_DIR})")
set(IPP_FOUND 0 PARENT_SCOPE)
endif() endif()
return()
endfunction() endfunction()

4
modules/core/include/opencv2/core/internal.hpp
View File

@ -104,6 +104,10 @@ CV_INLINE IppiSize ippiSize(const cv::Size & _size)
return size; return size;
} }
#if IPP_VERSION_MAJOR >= 9 // IPP 9+ is not supported
#undef HAVE_IPP
#undef IPP_VERSION_MAJOR
#endif
#endif #endif
#ifndef IPPI_CALL #ifndef IPPI_CALL