From 0bfa58b68d748ebe74fa6f41db38cbf5a3daa55e Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Mon, 8 Oct 2012 22:00:25 +0400 Subject: [PATCH] fixed detection of IPP 7.1 (patch #2413: thanks to Gino van den Bergen!) --- cmake/OpenCVFindIPP.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/OpenCVFindIPP.cmake b/cmake/OpenCVFindIPP.cmake index 6d735be68..d1af60565 100644 --- 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