From 9228a8bee6a89e5dc6092e6cd7c2c67d0ef9b4e6 Mon Sep 17 00:00:00 2001 From: Pavel Vlasov Date: Tue, 31 Jan 2017 16:39:09 +0300 Subject: [PATCH] Fixes IPP build on linux; --- cmake/OpenCVFindIPP.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/OpenCVFindIPP.cmake b/cmake/OpenCVFindIPP.cmake index 6913052ff4..ba3f5de118 100644 --- a/cmake/OpenCVFindIPP.cmake +++ b/cmake/OpenCVFindIPP.cmake @@ -182,15 +182,15 @@ macro(ipp_detect_version) if(HAVE_IPP_ICV_ONLY) _ipp_add_library(icv) else() - _ipp_add_library(core) - _ipp_add_library(s) + _ipp_add_library(m) + _ipp_add_library(cv) _ipp_add_library(i) _ipp_add_library(cc) - _ipp_add_library(cv) + _ipp_add_library(s) _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) if(NOT EXISTS ${INTEL_COMPILER_LIBRARY_DIR}) 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(imf) _ipp_add_compiler_library(svml) - endif(UNIX) + endif() endif() #message(STATUS "IPP libs: ${IPP_LIBRARIES}")