fixed detection of IPP 7.1 (patch #2413: thanks to Gino van den Bergen!)
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Mon, 8 Oct 2012 18:00:25 +0000 (22:00 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Mon, 8 Oct 2012 18:00:25 +0000 (22:00 +0400)
cmake/OpenCVFindIPP.cmake

index 6d735be..d1af605 100644 (file)
@@ -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