Merge pull request #12909 from alalek:cmake_fix_baseline_detect_flags

7 years ago · 2933b58a2f
parent 1c1d653f3a 0f07edded6
commit 2933b58a2f
1 changed files with 3 additions and 1 deletions
--- 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})