From 98b8c32f30aeac730ded94407ab7a1113130ad46 Mon Sep 17 00:00:00 2001 From: Sergiu Deitsch Date: Fri, 31 Mar 2017 15:44:38 +0200 Subject: [PATCH] cmake: fixed standalone dynamic IPP detection under win32 --- cmake/OpenCVFindIPP.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake/OpenCVFindIPP.cmake b/cmake/OpenCVFindIPP.cmake index 6913052ff4..c56928f01d 100644 --- 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})