mirror of
https://github.com/opencv/opencv.git
synced 2025-06-12 20:42:53 +08:00
Merge pull request #25317 from junxnone:ipp_202110
Fix for IPP 2021.10 with OneAPI 2024 #25317 fixes #25270 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
This commit is contained in:
parent
5da17a4b03
commit
882f46e1d3
@ -84,7 +84,7 @@ endmacro()
|
|||||||
# This macro uses IPP_ROOT_DIR variable
|
# This macro uses IPP_ROOT_DIR variable
|
||||||
# TODO Cleanup code after ICV package stabilization
|
# TODO Cleanup code after ICV package stabilization
|
||||||
macro(ipp_detect_version)
|
macro(ipp_detect_version)
|
||||||
set(IPP_INCLUDE_DIRS ${IPP_ROOT_DIR}/include)
|
get_filename_component(IPP_INCLUDE_DIRS ${IPP_VERSION_FILE} PATH)
|
||||||
|
|
||||||
set(__msg)
|
set(__msg)
|
||||||
if(EXISTS ${IPP_ROOT_DIR}/include/ippicv_redefs.h)
|
if(EXISTS ${IPP_ROOT_DIR}/include/ippicv_redefs.h)
|
||||||
@ -271,7 +271,9 @@ if(NOT DEFINED IPPROOT)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
file(TO_CMAKE_PATH "${IPPROOT}" __IPPROOT)
|
file(TO_CMAKE_PATH "${IPPROOT}" __IPPROOT)
|
||||||
if(EXISTS "${__IPPROOT}/include/ippversion.h")
|
file(GLOB_RECURSE IPP_VERSION_FILE "${__IPPROOT}/include/*ippversion.h")
|
||||||
|
|
||||||
|
if(EXISTS ${IPP_VERSION_FILE})
|
||||||
set(IPP_ROOT_DIR ${__IPPROOT})
|
set(IPP_ROOT_DIR ${__IPPROOT})
|
||||||
ipp_detect_version()
|
ipp_detect_version()
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user