Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source
pull/7434/merge
Alexander Alekhin 8 years ago
parent c049275512 98b8c32f30
commit 8bee226d79
1 changed files with 7 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      cmake/OpenCVFindIPP.cmake

9
cmake/OpenCVFindIPP.cmake
Unescape 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)
set(IPP_LIB_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX}) if (WIN32)
set(IPP_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) 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 () 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})

Write Preview
Loading…
Cancel
Save