Merge pull request #13278 from mshabunin:fix-carotene-build

dd952f6d · Alexander Alekhin · e63efe29 · fb6929ac · dd952f6d
Commit dd952f6d authored Nov 26, 2018 by Alexander Alekhin
Hide 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()