Merge pull request #13279 from mshabunin:fix-carotene-build-3.4

37d064f5 · Alexander Alekhin · ca5455c5 · 26cb154f · 37d064f5
Commit 37d064f5 authored Nov 26, 2018 by Alexander Alekhin
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

CMakeLists.txt 3rdparty/carotene/hal/CMakeLists.txt +1 -1

No files found.
--- a/3rdparty/carotene/hal/CMakeLists.txt
+++ b/3rdparty/carotene/hal/CMakeLists.txt
@@ -53,7 +53,7 @@ endif()
 set(CAROTENE_NS "carotene_o4t" CACHE STRING "" FORCE)

 function(compile_carotene)
-  if(ENABLE_NEON)
+  if(";${CPU_BASELINE_FINAL};" MATCHES ";NEON;")
    set(WITH_NEON ON)
  endif()