fix issue in IPP search algorithm (when no IPPROOT available in system and IPP is...

diff --git a/OpenCVFindIPP.cmake b/OpenCVFindIPP.cmake
index 290107c..1927454 100644 (file)
--- a/OpenCVFindIPP.cmake
+++ b/OpenCVFindIPP.cmake
@@ -260,14 +260,14 @@ endfunction()
     # Note, if several IPP installations found the newest version will be\r
     # selected\r
     # ------------------------------------------------------------------------\r
-    foreach(CURDIR ${CMAKE_SYSTEM_PREFIX_PATH})\r
-        set(CURDIR ${CURDIR}/intel)\r
-        file(TO_CMAKE_PATH ${CURDIR} CURDIR)\r
+    foreach(curdir ${CMAKE_SYSTEM_PREFIX_PATH})\r
+        set(curdir ${curdir}/intel)\r
+        file(TO_CMAKE_PATH ${curdir} CURDIR)\r
 \r
-        if(EXISTS ${CURDIR})\r
-            file(GLOB_RECURSE IPP_H_PATH ${CURDIR}/ippversion.h)\r
+        if(EXISTS ${curdir})\r
+            file(GLOB_RECURSE IPP_H_DIR ${curdir}/ippversion.h)\r
 \r
-            if(IPP_H_PATH)\r
+            if(IPP_H_DIR)\r
                 set(IPP_FOUND 1)\r
             endif()\r
 \r
@@ -276,7 +276,7 @@ endfunction()
             set(IPP_LATEST_VERSION_STR ${IPP_VERSION_STR})\r
 \r
             # look through all dirs where ippversion.h was found\r
-            foreach(item ${IPP_H_PATH})\r
+            foreach(item ${IPP_H_DIR})\r
 \r
                 # traverse up to IPPROOT level\r
                 get_filename_component(_FILE_PATH ${item} PATH)\r
@@ -285,15 +285,14 @@ endfunction()
                 # extract IPP version info\r
                 get_ipp_version(${_ROOT_DIR})\r
 \r
+                # remember the latest version (if many found)\r
                 if(${IPP_LATEST_VERSION_STR} VERSION_LESS ${IPP_VERSION_STR})\r
-#                if(${IPP_LATEST_VERSION_STR} VERSION_GREATER ${IPP_VERSION_STR})\r
                     set(IPP_LATEST_VERSION_STR   ${IPP_VERSION_STR})\r
                     set(IPP_LATEST_VERSION_MAJOR ${IPP_VERSION_MAJOR})\r
                     set(IPP_LATEST_VERSION_MINOR ${IPP_VERSION_MINOR})\r
                     set(IPP_LATEST_VERSION_BUILD ${IPP_VERSION_BUILD})\r
                     set(IPP_ROOT_DIR ${_ROOT_DIR})\r
                 endif()\r
-                \r
             endforeach()\r
         endif()\r
     endforeach()\r
@@ -301,3 +300,13 @@ endfunction()
     # set IPP INCLUDE, LIB dirs and library names\r
     set_ipp_variables(${IPP_LATEST_VERSION_STR})\r
 \r
+    # set CACHE variable IPP_H_PATH,\r
+    # path to IPP header files for the latest version\r
+    find_path(\r
+        IPP_H_PATH\r
+        NAMES ippversion.h\r
+        PATHS ${IPP_ROOT_DIR}\r
+        PATH_SUFFIXES include\r
+        DOC "The path to Intel(R) IPP header files"\r
+        NO_DEFAULT_PATH\r
+        NO_CMAKE_PATH)\r