IPP: use linker workaround for Intel compiler on Linux
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Fri, 2 Apr 2021 07:44:32 +0000 (10:44 +0300)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Fri, 2 Apr 2021 07:44:32 +0000 (10:44 +0300)
cmake/OpenCVFindIPP.cmake
cmake/OpenCVFindLibsPerf.cmake

index b4f3a78..6bcd81d 100644 (file)
@@ -151,7 +151,7 @@ macro(ipp_detect_version)
         if("${name}" STREQUAL "core")  # https://github.com/opencv/opencv/pull/19681
           if(OPENCV_FORCE_IPP_EXCLUDE_LIBS OR OPENCV_FORCE_IPP_EXCLUDE_LIBS_CORE
               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
           )
index 3753084..a191afd 100644 (file)
@@ -29,7 +29,7 @@ if(WITH_IPP)
     if(OPENCV_FORCE_IPP_EXCLUDE_LIBS
         OR (HAVE_IPP_ICV
             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
     )