mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-26 07:07:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes IPP build on linux;

Browse Source
This commit is contained in:
Pavel Vlasov 2017-01-31 16:39:09 +03:00
parent dfb348ef0b
commit 9228a8bee6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/OpenCVFindIPP.cmake
View File

@ -182,15 +182,15 @@ macro(ipp_detect_version)
if(HAVE_IPP_ICV_ONLY) if(HAVE_IPP_ICV_ONLY)
_ipp_add_library(icv) _ipp_add_library(icv)
else() else()
_ipp_add_library(core) _ipp_add_library(m)
_ipp_add_library(s) _ipp_add_library(cv)
_ipp_add_library(i) _ipp_add_library(i)
_ipp_add_library(cc) _ipp_add_library(cc)
_ipp_add_library(cv) _ipp_add_library(s)
_ipp_add_library(vm) _ipp_add_library(vm)
_ipp_add_library(m) _ipp_add_library(core)
if(UNIX) if(UNIX AND IPP_VERSION_MAJOR LESS 2017)
get_filename_component(INTEL_COMPILER_LIBRARY_DIR ${IPP_ROOT_DIR}/../lib REALPATH) get_filename_component(INTEL_COMPILER_LIBRARY_DIR ${IPP_ROOT_DIR}/../lib REALPATH)
if(NOT EXISTS ${INTEL_COMPILER_LIBRARY_DIR}) if(NOT EXISTS ${INTEL_COMPILER_LIBRARY_DIR})
get_filename_component(INTEL_COMPILER_LIBRARY_DIR ${IPP_ROOT_DIR}/../compiler/lib REALPATH) get_filename_component(INTEL_COMPILER_LIBRARY_DIR ${IPP_ROOT_DIR}/../compiler/lib REALPATH)
@ -223,7 +223,7 @@ macro(ipp_detect_version)
_ipp_add_compiler_library(irc) _ipp_add_compiler_library(irc)
_ipp_add_compiler_library(imf) _ipp_add_compiler_library(imf)
_ipp_add_compiler_library(svml) _ipp_add_compiler_library(svml)
endif(UNIX) endif()
endif() endif()
#message(STATUS "IPP libs: ${IPP_LIBRARIES}") #message(STATUS "IPP libs: ${IPP_LIBRARIES}")