Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
seo young Joung
opencv
Commits
c72466c4
Commit
c72466c4
authored
14 years ago
by
Vladimir Dudnik
Browse files
Options
Download
Email Patches
Plain Diff
fix issue in IPP search algorithm (when no IPPROOT available in system and IPP is installed)
parent
767af0f2
4.x
2.4
3.4
5.x
master
next
4.5.5
4.5.4
4.5.3
4.5.3-openvino
4.5.3-openvino-2021.4.2
4.5.3-openvino-2021.4.1
4.5.2
4.5.2-openvino
4.5.1
4.5.1-openvino
4.5.0
4.5.0-openvino
4.4.0
4.4.0-openvino
4.3.0
4.3.0-openvino
4.3.0-openvino-2020.3.0
4.2.0
4.2.0-openvino
4.1.2
4.1.2-openvino
4.1.1
4.1.1-openvino
4.1.0
4.1.0-openvino
4.0.1
4.0.1-openvino
4.0.0
4.0.0-rc
4.0.0-openvino
4.0.0-beta
4.0.0-alpha
3.4.17
3.4.16
3.4.15
3.4.14
3.4.13
3.4.12
3.4.11
3.4.10
3.4.9
3.4.8
3.4.7
3.4.6
3.4.5
3.4.4
3.4.3
3.4.3-openvino
3.4.2
3.4.2-openvino
3.4.1
3.4.1-cvsdk
3.4.0
3.4.0-rc
3.3.1
3.3.1-cvsdk
3.3.0
3.3.0-rc
3.3.0-cvsdk
3.2.0
3.2.0-rc
3.1.0
3.0.0
3.0.0-rc1
3.0.0-beta
3.0.0-alpha
3.0-ocl-tp2
3.0-ocl-tech-preview
2.4.13.7
2.4.13.6
2.4.13.5
2.4.13.4
2.4.13.3
2.4.13.2
2.4.13.1
2.4.13
2.4.12.3
2.4.12.2
2.4.12.1
2.4.12
2.4.11
2.4.10.4
2.4.10.3
2.4.10.2
2.4.10.1
2.4.10
2.4.9.1
2.4.9
2.4.8.3
2.4.8.2
2.4.8.1
2.4.8
2.4.7.2
2.4.7.1
2.4.7
2.4.7-rc1
2.4.6.2
2.4.6.2r3
2.4.6.2r2
2.4.6.2-rc1
2.4.6.1
2.4.6
2.4.5
2.4.4
2.4.4-beta
2.4.3.2
2.4.3.1
2.4.3
2.4.3-rc
2.4.2
2.4.1
2.4.0
2.3.1
2.3.0
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
OpenCVFindIPP.cmake
+18
-9
OpenCVFindIPP.cmake
with
18 additions
and
9 deletions
+18
-9
OpenCVFindIPP.cmake
View file @
c72466c4
...
...
@@ -260,14 +260,14 @@ endfunction()
# Note, if several IPP installations found the newest version will be
# selected
# ------------------------------------------------------------------------
foreach
(
CURDIR
${
CMAKE_SYSTEM_PREFIX_PATH
}
)
set
(
CURDIR
${
CURDIR
}
/intel
)
file
(
TO_CMAKE_PATH
${
CURDIR
}
CURDIR
)
foreach
(
curdir
${
CMAKE_SYSTEM_PREFIX_PATH
}
)
set
(
curdir
${
curdir
}
/intel
)
file
(
TO_CMAKE_PATH
${
curdir
}
CURDIR
)
if
(
EXISTS
${
CURDIR
}
)
file
(
GLOB_RECURSE IPP_H_
PATH
${
CURDIR
}
/ippversion.h
)
if
(
EXISTS
${
curdir
}
)
file
(
GLOB_RECURSE IPP_H_
DIR
${
curdir
}
/ippversion.h
)
if
(
IPP_H_
PATH
)
if
(
IPP_H_
DIR
)
set
(
IPP_FOUND 1
)
endif
()
...
...
@@ -276,7 +276,7 @@ endfunction()
set
(
IPP_LATEST_VERSION_STR
${
IPP_VERSION_STR
}
)
# look through all dirs where ippversion.h was found
foreach
(
item
${
IPP_H_
PATH
}
)
foreach
(
item
${
IPP_H_
DIR
}
)
# traverse up to IPPROOT level
get_filename_component
(
_FILE_PATH
${
item
}
PATH
)
...
...
@@ -285,15 +285,14 @@ endfunction()
# extract IPP version info
get_ipp_version
(
${
_ROOT_DIR
}
)
# remember the latest version (if many found)
if
(
${
IPP_LATEST_VERSION_STR
}
VERSION_LESS
${
IPP_VERSION_STR
}
)
# if(${IPP_LATEST_VERSION_STR} VERSION_GREATER ${IPP_VERSION_STR})
set
(
IPP_LATEST_VERSION_STR
${
IPP_VERSION_STR
}
)
set
(
IPP_LATEST_VERSION_MAJOR
${
IPP_VERSION_MAJOR
}
)
set
(
IPP_LATEST_VERSION_MINOR
${
IPP_VERSION_MINOR
}
)
set
(
IPP_LATEST_VERSION_BUILD
${
IPP_VERSION_BUILD
}
)
set
(
IPP_ROOT_DIR
${
_ROOT_DIR
}
)
endif
()
endforeach
()
endif
()
endforeach
()
...
...
@@ -301,3 +300,13 @@ endfunction()
# set IPP INCLUDE, LIB dirs and library names
set_ipp_variables
(
${
IPP_LATEST_VERSION_STR
}
)
# set CACHE variable IPP_H_PATH,
# path to IPP header files for the latest version
find_path
(
IPP_H_PATH
NAMES ippversion.h
PATHS
${
IPP_ROOT_DIR
}
PATH_SUFFIXES include
DOC
"The path to Intel(R) IPP header files"
NO_DEFAULT_PATH
NO_CMAKE_PATH
)
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help