Merge pull request opencv#8495 from sergiud:standalone-dynamic-ipp-detection

alalek · alalek · commit 8bee226d7953 · 2017-04-02T10:17:06.000Z
diff --git a/cmake/OpenCVFindIPP.cmake b/cmake/OpenCVFindIPP.cmake
@@ -129,8 +129,13 @@ macro(ipp_detect_version)
   macro(_ipp_add_library name)
     # dynamic linking is only supported for standalone version of IPP
     if (BUILD_WITH_DYNAMIC_IPP AND NOT HAVE_IPP_ICV_ONLY)
-      set(IPP_LIB_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX})
-      set(IPP_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+      if (WIN32)
+        set(IPP_LIB_PREFIX ${CMAKE_IMPORT_LIBRARY_PREFIX})
+        set(IPP_LIB_SUFFIX ${CMAKE_IMPORT_LIBRARY_SUFFIX})
+      else (WIN32)
+        set(IPP_LIB_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX})
+        set(IPP_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
+      endif (WIN32)
     else ()
       set(IPP_LIB_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
       set(IPP_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
