Add IPP 8.0 support in FindIPP script

diff --git a/cmake/OpenCVFindIPP.cmake b/cmake/OpenCVFindIPP.cmake
index 9921d2503c456492c534e8150b2ae5d69a847f07..9f74d941faa8c67e9c597edb7819c0a346280661 100644 (file)
--- a/cmake/OpenCVFindIPP.cmake
+++ b/cmake/OpenCVFindIPP.cmake
@@ -136,17 +136,20 @@ endfunction()
 
 # ------------------------------------------------------------------------
 # This is auxiliary function called from set_ipp_variables()
-# to set IPP_LIBRARIES variable in IPP 7.x style
+# to set IPP_LIBRARIES variable in IPP 7.x and 8.x style
 # ------------------------------------------------------------------------
 function(set_ipp_new_libraries _LATEST_VERSION)
     set(IPP_PREFIX "ipp")
     
     if(${_LATEST_VERSION} VERSION_LESS "8.0")
-        set(IPP_SUFFIX "_l")       # static not threaded libs suffix
+        set(IPP_SUFFIX "_l")        # static not threaded libs suffix IPP 7.x
     else()
-        set(IPP_SUFFIX "")       # static not threaded libs suffix
+        if(WIN32)
+            set(IPP_SUFFIX "mt")    # static not threaded libs suffix IPP 8.x for Windows
+        else()
+            set(IPP_SUFFIX "")      # static not threaded libs suffix IPP 8.x for Linux/OS X
+        endif()
     endif()
-    set(IPP_THRD   "_t")       # static threaded libs suffix
     set(IPPCORE    "core")     # core functionality
     set(IPPSP      "s")        # signal processing
     set(IPPIP      "i")        # image processing
@@ -218,7 +221,7 @@ function(set_ipp_variables _LATEST_VERSION)
             set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/ia32 PARENT_SCOPE)
         endif()
 
-        # set IPP_LIBRARIES variable (7.x lib names)
+        # set IPP_LIBRARIES variable (7.x or 8.x lib names)
         set_ipp_new_libraries(${_LATEST_VERSION})
         set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE)
         message(STATUS "IPP libs: ${IPP_LIBRARIES}")