potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #12925 from alalek:fix_cmake_conditions

Browse Source
This commit is contained in:
Alexander Alekhin
2018-10-25 11:52:39 +00:00
parent b184b19970 d6a8e08acc
commit 7e2c65ce3c
9 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/OpenCVFindIPP.cmake
+2 -2
View File
@@ -105,7 +105,7 @@ macro(ipp_detect_version)
message(STATUS "found Intel IPP${__msg}: ${_MAJOR}.${_MINOR}.${_BUILD} [${IPP_VERSION_STR}]")
message(STATUS "at: ${IPP_ROOT_DIR}")
if(${IPP_VERSION_STR} VERSION_LESS "7.0")
if(IPP_VERSION_STR VERSION_LESS "7.0")
_ipp_not_supported("Intel IPP ${IPP_VERSION_STR} is not supported")
endif()
@@ -166,7 +166,7 @@ macro(ipp_detect_version)
endmacro()
set(IPP_PREFIX "ipp")
if(${IPP_VERSION_STR} VERSION_LESS "8.0")
if(IPP_VERSION_STR VERSION_LESS "8.0")
if (BUILD_WITH_DYNAMIC_IPP AND NOT HAVE_IPP_ICV)
set(IPP_SUFFIX "") # dynamic not threaded libs suffix Intel IPP 7.x
else ()