Merge pull request #12909 from alalek:cmake_fix_baseline_detect_flags

2933b58a · Alexander Alekhin · 1c1d653f · 0f07edde · 2933b58a
Commit 2933b58a authored Oct 24, 2018 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

OpenCVCompilerOptimizations.cmake cmake/OpenCVCompilerOptimizations.cmake +2 -0

No files found.
--- a/cmake/OpenCVCompilerOptimizations.cmake
+++ b/cmake/OpenCVCompilerOptimizations.cmake
@@ -448,9 +448,11 @@ foreach(OPT ${CPU_KNOWN_OPTIMIZATIONS})
      if(NOT ";${CPU_BASELINE_FINAL};" MATCHES ";${OPT};")
        list(APPEND CPU_BASELINE_FINAL ${OPT})
      endif()
+      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()

 foreach(OPT ${CPU_BASELINE_REQUIRE})