third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: fixed standalone dynamic IPP detection under win32

Browse Source
This commit is contained in:
Sergiu Deitsch 2017-03-31 15:44:38 +02:00
parent 70bbf17b13
commit 98b8c32f30
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/OpenCVFindIPP.cmake
View File

@ -129,8 +129,13 @@ macro(ipp_detect_version)
macro(_ipp_add_library name) macro(_ipp_add_library name)
# dynamic linking is only supported for standalone version of IPP # dynamic linking is only supported for standalone version of IPP
if (BUILD_WITH_DYNAMIC_IPP AND NOT HAVE_IPP_ICV_ONLY) if (BUILD_WITH_DYNAMIC_IPP AND NOT HAVE_IPP_ICV_ONLY)
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_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX})
set(IPP_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) set(IPP_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
endif (WIN32)
else () else ()
set(IPP_LIB_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX}) set(IPP_LIB_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX})
set(IPP_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX}) set(IPP_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})