Skip to content

O
opencv
Commit 8bee226d authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

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

parents c0492755 98b8c32f
master 4.3.0 4.2.0 4.1.2 4.1.2-openvino 4.1.1 4.1.1-openvino 4.1.0 4.1.0-openvino 4.0.1 4.0.1-openvino 4.0.0 4.0.0-rc 4.0.0-openvino 4.0.0-beta 4.0.0-alpha 3.4.10 3.4.9 3.4.8 3.4.7 3.4.6 3.4.5 3.4.4 3.4.3 3.4.3-openvino 3.4.2 3.4.2-openvino 3.4.1 3.4.1-cvsdk 3.4.0 3.4.0-rc 3.3.1 3.3.1-cvsdk 3.3.0 3.3.0-rc 3.3.0-cvsdk
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
cmake/OpenCVFindIPP.cmake
View file @ 8bee226d
......@@ -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})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment