fixed detection of IPP 7.1 (patch #2413: thanks to Gino van den Bergen!)

12 years ago · 0bfa58b68d
parent 4be7619ce4
commit 0bfa58b68d
1 changed files with 3 additions and 0 deletions
--- a/cmake/OpenCVFindIPP.cmake
+++ b/cmake/OpenCVFindIPP.cmake
@ -65,6 +65,9 @@ function(get_ipp_version _ROOT_DIR)
    file(STRINGS ${_ROOT_DIR}/include/ippversion.h STR1 REGEX "IPP_VERSION_MAJOR")
    file(STRINGS ${_ROOT_DIR}/include/ippversion.h STR2 REGEX "IPP_VERSION_MINOR")
    file(STRINGS ${_ROOT_DIR}/include/ippversion.h STR3 REGEX "IPP_VERSION_BUILD")
+    if("${STR3}" STREQUAL "")
+        file(STRINGS ${_ROOT_DIR}/include/ippversion.h STR3 REGEX "IPP_VERSION_UPDATE")
+    endif()
    file(STRINGS ${_ROOT_DIR}/include/ippversion.h STR4 REGEX "IPP_VERSION_STR")

    # extract info and assign to variables