Merge pull request #12909 from alalek:cmake_fix_baseline_detect_flags

This commit is contained in:
Alexander Alekhin 2018-10-24 13:05:14 +00:00
commit 2933b58a2f

View File

@ -448,9 +448,11 @@ foreach(OPT ${CPU_KNOWN_OPTIMIZATIONS})
if(NOT ";${CPU_BASELINE_FINAL};" MATCHES ";${OPT};") if(NOT ";${CPU_BASELINE_FINAL};" MATCHES ";${OPT};")
list(APPEND CPU_BASELINE_FINAL ${OPT}) list(APPEND CPU_BASELINE_FINAL ${OPT})
endif() endif()
if(NOT CPU_BASELINE_DETECT) # Don't change compiler flags in 'detection' mode
ocv_append_optimization_flag(CPU_BASELINE_FLAGS ${OPT}) ocv_append_optimization_flag(CPU_BASELINE_FLAGS ${OPT})
endif() endif()
endif() endif()
endif()
endforeach() endforeach()
foreach(OPT ${CPU_BASELINE_REQUIRE}) foreach(OPT ${CPU_BASELINE_REQUIRE})