Ticket #52328: patch-use-avfound-no-qtkit.diff

File patch-use-avfound-no-qtkit.diff, 1.9 KB (added by mkae (Marko Käning), 4 years ago)
  • CMakeLists.txt

    diff --git CMakeLists.txt CMakeLists.txt
    index 3ee50ff..357a700 100644
    endif() 
    162162# Optional 3rd party components
    163163# ===================================================
    164164OCV_OPTION(WITH_1394           "Include IEEE1394 support"                    ON   IF (NOT ANDROID AND NOT IOS AND NOT WINRT) )
    165 OCV_OPTION(WITH_AVFOUNDATION   "Use AVFoundation for Video I/O"              ON   IF IOS)
     165OCV_OPTION(WITH_AVFOUNDATION   "Use AVFoundation for Video I/O"              ON   IF (APPLE OR IOS))
    166166OCV_OPTION(WITH_CARBON         "Use Carbon for UI instead of Cocoa"          OFF  IF APPLE )
    167167OCV_OPTION(WITH_VTK            "Include VTK library support (and build opencv_viz module eiher)"             ON  IF (NOT ANDROID AND NOT IOS AND NOT WINRT AND NOT CMAKE_CROSSCOMPILING) )
    168168OCV_OPTION(WITH_CUDA           "Include NVidia Cuda Runtime support"                                         ON  IF (NOT IOS AND NOT WINRT) )
  • cmake/OpenCVFindLibsVideo.cmake

    diff --git cmake/OpenCVFindLibsVideo.cmake cmake/OpenCVFindLibsVideo.cmake
    index 2e09cf2..978d9de 100644
    if (NOT IOS) 
    316316  if(WITH_QUICKTIME)
    317317    set(HAVE_QUICKTIME YES)
    318318  elseif(APPLE AND CMAKE_COMPILER_IS_CLANGCXX)
    319     set(HAVE_QTKIT YES)
     319    set(HAVE_QTKIT NO)
    320320  endif()
    321321endif()
    322322
  • modules/videoio/CMakeLists.txt

    diff --git modules/videoio/CMakeLists.txt modules/videoio/CMakeLists.txt
    index b5da8d0..e4ca82b 100644
    endif(HAVE_GIGE_API) 
    167167
    168168if(HAVE_AVFOUNDATION)
    169169  list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_avfoundation.mm)
    170   list(APPEND VIDEOIO_LIBRARIES "-framework AVFoundation" "-framework QuartzCore")
     170  list(APPEND VIDEOIO_LIBRARIES "-framework AVFoundation" "-framework QuartzCore" "-framework CoreMedia" "-framework CoreFoundation" "-framework AppKit")
    171171endif()
    172172
    173173if(HAVE_QUICKTIME)