From 63775320ae02a68a5c8fd7a930253fb08d2d9367 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 4 Aug 2019 18:24:33 -0400 Subject: [PATCH] Verify Carbon correctly on OSX --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43b0060938..bc90983453 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -240,8 +240,8 @@ OCV_OPTION(WITH_AVFOUNDATION "Use AVFoundation for Video I/O (iOS/Mac)" ON VISIBLE_IF APPLE VERIFY HAVE_AVFOUNDATION) OCV_OPTION(WITH_CARBON "Use Carbon for UI instead of Cocoa (OBSOLETE)" OFF - VISIBLE_IF APPLE - VERIFY HAVE_CARBON OR HAVE_COCOA) + VISIBLE_IF (APPLE OR HAVE_COCOA) + VERIFY HAVE_CARBON) 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")) OCV_OPTION(WITH_CPUFEATURES "Use cpufeatures Android library" ON