Merge pull request #12909 from alalek:cmake_fix_baseline_detect_flags

2933b58a · Alexander Alekhin · 1c1d653f · 0f07edde · 2933b58a
隐藏空白更改
内联并排

Showing with 3 addition and 1 deletion

cmake/OpenCVCompilerOptimizations.cmake cmake/OpenCVCompilerOptimizations.cmake +3 -1

未找到文件。
--- a/cmake/OpenCVCompilerOptimizations.cmake
+++ b/cmake/OpenCVCompilerOptimizations.cmake
@@ -448,7 +448,9 @@ foreach(OPT ${CPU_KNOWN_OPTIMIZATIONS})
      if(NOT ";${CPU_BASELINE_FINAL};" MATCHES ";${OPT};")
        list(APPEND CPU_BASELINE_FINAL ${OPT})
      endif()
-      ocv_append_optimization_flag(CPU_BASELINE_FLAGS ${OPT})
+      if(NOT CPU_BASELINE_DETECT)  # Don't change compiler flags in 'detection' mode
+        ocv_append_optimization_flag(CPU_BASELINE_FLAGS ${OPT})
+      endif()
    endif()
  endif()
 endforeach()