mirror of
https://github.com/opencv/opencv.git
synced 2025-06-07 17:44:04 +08:00
Merge pull request #21562 from alalek:cmake_carotene_use_cv_disable_optimization
This commit is contained in:
commit
09af10f635
@ -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
|
OCV_OPTION(WITH_CARBON "Use Carbon for UI instead of Cocoa (OBSOLETE)" OFF
|
||||||
VISIBLE_IF (APPLE OR HAVE_COCOA)
|
VISIBLE_IF (APPLE OR HAVE_COCOA)
|
||||||
VERIFY HAVE_CARBON)
|
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"))
|
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
|
OCV_OPTION(WITH_CPUFEATURES "Use cpufeatures Android library" ON
|
||||||
VISIBLE_IF ANDROID
|
VISIBLE_IF ANDROID
|
||||||
|
Loading…
Reference in New Issue
Block a user