IPP: use linker workaround for Intel compiler on Linux

pull/19838/head
Maksim Shabunin 4 years ago
parent 6a72bf5085
commit 6465e393b6
  1. 2
      cmake/OpenCVFindIPP.cmake
  2. 2
      cmake/OpenCVFindLibsPerf.cmake

@ -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
) )

@ -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
) )

Loading…
Cancel
Save