Refactored detecting several Apple-related technologies.

Now the HAVE_* macros are set using cvconfig.h. Previously most
of them already were there, but were always undefined. One,
HAVE_COCOA, I had to add.

This also makes the CMake code more consistent; now, WITH_* variables
are always checked in cmake/*, while HAVE_* variables are checked in
modules/highgui/CMakeLists.txt.

cmake/OpenCVFindLibsGUI.cmake

@@ -65,3 +65,12 @@ if(WITH_OPENGL)
     endif()
   endif()
 endif(WITH_OPENGL)
+
+# --- Carbon & Cocoa ---
+if(APPLE)
+  if(WITH_CARBON)
+    set(HAVE_CARBON YES)
+  elif(NOT IOS)
+    set(HAVE_COCOA YES)
+  endif()
+endif()

cmake/OpenCVFindLibsGrfmt.cmake

@@ -162,3 +162,8 @@ endif()
 if(ZLIB_FOUND)
   ocv_parse_header2(ZLIB "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_VERSION)
 endif()
+
+# --- Apple ImageIO ---
+if(WITH_IMAGEIO)
+  set(HAVE_IMAGEIO YES)
+endif()

cmake/OpenCVFindLibsVideo.cmake

@@ -228,3 +228,13 @@ if(WIN32)
     list(APPEND HIGHGUI_LIBRARIES winmm)
   endif()
 endif(WIN32)
+
+# --- Apple AV Foundation ---
+if(WITH_AVFOUNDATION)
+  set(HAVE_AVFOUNDATION YES)
+endif()
+
+# --- QuickTime ---
+if(WITH_QUICKTIME)
+  set(HAVE_QUICKTIME YES)
+endif()

cmake/templates/cvconfig.h.cmake

@@ -16,6 +16,9 @@
 /* Carbon windowing environment */
 #cmakedefine HAVE_CARBON
 
+/* Cocoa API */
+#cmakedefine HAVE_COCOA
+
 /* IEEE1394 capturing support */
 #cmakedefine HAVE_DC1394
 

modules/highgui/CMakeLists.txt

@@ -108,16 +108,12 @@ elseif(HAVE_WIN32UI)
   list(APPEND highgui_srcs src/window_w32.cpp)
 elseif(HAVE_GTK)
   list(APPEND highgui_srcs src/window_gtk.cpp)
-elseif(APPLE)
+elseif(HAVE_CARBON)
-  if(WITH_CARBON)
-    add_definitions(-DHAVE_CARBON=1)
   list(APPEND highgui_srcs src/window_carbon.cpp)
   list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime")
-  elseif(NOT IOS)
+elseif(HAVE_COCOA)
-    add_definitions(-DHAVE_COCOA=1)
   list(APPEND highgui_srcs src/window_cocoa.mm)
   list(APPEND HIGHGUI_LIBRARIES "-framework Cocoa")
-  endif()
 endif()
 
 if(WIN32 AND NOT ARM)
@@ -210,26 +206,21 @@ if(HAVE_GIGE_API)
   list(APPEND highgui_srcs src/cap_giganetix.cpp)
 endif(HAVE_GIGE_API)
 
-if(WITH_IMAGEIO)
+if(HAVE_IMAGEIO AND IOS)
-  add_definitions(-DHAVE_IMAGEIO=1)
-  if(IOS)
   list(APPEND HIGHGUI_LIBRARIES "-framework ImageIO")
-  endif()
+endif()
-endif(WITH_IMAGEIO)
 
-if(WITH_AVFOUNDATION)
+if(HAVE_AVFOUNDATION)
-  add_definitions(-DHAVE_AVFOUNDATION=1)
   list(APPEND highgui_srcs src/cap_avfoundation.mm)
   list(APPEND HIGHGUI_LIBRARIES "-framework AVFoundation" "-framework QuartzCore")
-elseif(APPLE)
+endif()
-  add_definitions(-DHAVE_QUICKTIME=1)
+
-  if(WITH_QUICKTIME)
+if(HAVE_QUICKTIME)
   list(APPEND highgui_srcs src/cap_qt.cpp)
   list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime" "-framework CoreFoundation" "-framework QuartzCore")
-  else()
+elseif(APPLE)
   list(APPEND highgui_srcs src/cap_qtkit.mm)
   list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore" "-framework AppKit")
-  endif()
 endif()
 
 if(IOS)