Skip to content

O
opencv
Commit c5069266 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #15222 from hmaarrfk:verify_carbon

parents b584c230 63775320
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
CMakeLists.txt
View file @ c5069266
...@@ -240,8 +240,8 @@ OCV_OPTION(WITH_AVFOUNDATION "Use AVFoundation for Video I/O (iOS/Mac)" ON ...@@ -240,8 +240,8 @@ OCV_OPTION(WITH_AVFOUNDATION "Use AVFoundation for Video I/O (iOS/Mac)" ON
VISIBLE_IF APPLE VISIBLE_IF APPLE
VERIFY HAVE_AVFOUNDATION) VERIFY HAVE_AVFOUNDATION)
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 VISIBLE_IF (APPLE OR HAVE_COCOA)
VERIFY HAVE_CARBON 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" ON
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment