mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

IPP: use linker workaround for Intel compiler on Linux

Browse Source
This commit is contained in:
Maksim Shabunin 2021-04-02 10:44:32 +03:00
parent 6a72bf5085
commit 6465e393b6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVFindIPP.cmake
View File

@ -151,7 +151,7 @@ macro(ipp_detect_version)
if("${name}" STREQUAL "core") # https://github.com/opencv/opencv/pull/19681 if("${name}" STREQUAL "core") # https://github.com/opencv/opencv/pull/19681
if(OPENCV_FORCE_IPP_EXCLUDE_LIBS OR OPENCV_FORCE_IPP_EXCLUDE_LIBS_CORE if(OPENCV_FORCE_IPP_EXCLUDE_LIBS OR OPENCV_FORCE_IPP_EXCLUDE_LIBS_CORE
OR (UNIX AND NOT ANDROID AND NOT APPLE OR (UNIX AND NOT ANDROID AND NOT APPLE
AND (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|Intel"
) )
AND NOT OPENCV_SKIP_IPP_EXCLUDE_LIBS_CORE AND NOT OPENCV_SKIP_IPP_EXCLUDE_LIBS_CORE
) )

2
cmake/OpenCVFindLibsPerf.cmake
View File

@ -29,7 +29,7 @@ if(WITH_IPP)
if(OPENCV_FORCE_IPP_EXCLUDE_LIBS if(OPENCV_FORCE_IPP_EXCLUDE_LIBS
OR (HAVE_IPP_ICV OR (HAVE_IPP_ICV
AND UNIX AND NOT ANDROID AND NOT APPLE AND UNIX AND NOT ANDROID AND NOT APPLE
AND (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|Intel"
) )
AND NOT OPENCV_SKIP_IPP_EXCLUDE_LIBS AND NOT OPENCV_SKIP_IPP_EXCLUDE_LIBS
) )