Merge pull request opencv#8109 from lupustr3:pvlasov/ipp_build_fix

alalek · alalek · commit b333b1f6e856 · 2017-01-31T16:10:09.000Z
diff --git 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}")
