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

Merge pull request #1269 from kdrobnyh:FindIPP-cmake-script

Browse Source
pull/1306/merge
Roman Donchenko 12 years ago committed by OpenCV Buildbot
parent 84a9755597 ea5dd74af1
commit 868e355e33
1 changed files with 8 additions and 5 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. 13
      cmake/OpenCVFindIPP.cmake

13
cmake/OpenCVFindIPP.cmake
Unescape View File

@ -136,17 +136,20 @@ endfunction()
# ------------------------------------------------------------------------ # ------------------------------------------------------------------------
# This is auxiliary function called from set_ipp_variables() # This is auxiliary function called from set_ipp_variables()
# to set IPP_LIBRARIES variable in IPP 7.x style # to set IPP_LIBRARIES variable in IPP 7.x and 8.x style
# ------------------------------------------------------------------------ # ------------------------------------------------------------------------
function(set_ipp_new_libraries _LATEST_VERSION) function(set_ipp_new_libraries _LATEST_VERSION)
set(IPP_PREFIX "ipp") set(IPP_PREFIX "ipp")
if(${_LATEST_VERSION} VERSION_LESS "8.0") if(${_LATEST_VERSION} VERSION_LESS "8.0")
set(IPP_SUFFIX "_l") # static not threaded libs suffix set(IPP_SUFFIX "_l") # static not threaded libs suffix IPP 7.x
else() else()
set(IPP_SUFFIX "") # static not threaded libs suffix if(WIN32)
set(IPP_SUFFIX "mt") # static not threaded libs suffix IPP 8.x for Windows
else()
set(IPP_SUFFIX "") # static not threaded libs suffix IPP 8.x for Linux/OS X
endif()
endif() endif()
set(IPP_THRD "_t") # static threaded libs suffix
set(IPPCORE "core") # core functionality set(IPPCORE "core") # core functionality
set(IPPSP "s") # signal processing set(IPPSP "s") # signal processing
set(IPPIP "i") # image processing set(IPPIP "i") # image processing
@ -218,7 +221,7 @@ function(set_ipp_variables _LATEST_VERSION)
set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/ia32 PARENT_SCOPE) set(IPP_LIBRARY_DIRS ${IPP_ROOT_DIR}/lib/ia32 PARENT_SCOPE)
endif() endif()
# set IPP_LIBRARIES variable (7.x lib names) # set IPP_LIBRARIES variable (7.x or 8.x lib names)
set_ipp_new_libraries(${_LATEST_VERSION}) set_ipp_new_libraries(${_LATEST_VERSION})
set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE) set(IPP_LIBRARIES ${IPP_LIBRARIES} PARENT_SCOPE)
message(STATUS "IPP libs: ${IPP_LIBRARIES}") message(STATUS "IPP libs: ${IPP_LIBRARIES}")

Write Preview
Loading…
Cancel
Save