Merge pull request #21562 from alalek:cmake_carotene_use_cv_disable_optimization

3 years ago · 09af10f635
parent 5190043e56 4d7953aa56
commit 09af10f635
1 changed files with 1 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -244,7 +244,7 @@ OCV_OPTION(WITH_AVFOUNDATION "Use AVFoundation for Video I/O (iOS/Mac)" ON
 OCV_OPTION(WITH_CARBON "Use Carbon for UI instead of Cocoa (OBSOLETE)" OFF
  VISIBLE_IF (APPLE OR HAVE_COCOA)
  VERIFY HAVE_CARBON)
-OCV_OPTION(WITH_CAROTENE "Use NVidia carotene acceleration library for ARM platform" ON
+OCV_OPTION(WITH_CAROTENE "Use NVidia carotene acceleration library for ARM platform" (NOT CV_DISABLE_OPTIMIZATION)
  VISIBLE_IF (ARM OR AARCH64) AND NOT IOS AND NOT (CMAKE_VERSION VERSION_LESS "2.8.11"))
 OCV_OPTION(WITH_CPUFEATURES "Use cpufeatures Android library" ON
  VISIBLE_IF ANDROID