potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #7266 from alalek:pr7159

Browse Source
This commit is contained in:
Vadim Pisarevsky
2016-09-16 21:18:26 +00:00
parent d5c202e46b f85e33f4af
commit dc3d0cbc22
4 changed files with 1351 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/CMakeLists.txt
+7 -2
View File
@@ -168,8 +168,13 @@ if(HAVE_GIGE_API)
endif(HAVE_GIGE_API)
if(HAVE_AVFOUNDATION)
list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_avfoundation.mm)
list(APPEND VIDEOIO_LIBRARIES "-framework AVFoundation" "-framework QuartzCore")
if(IOS)
list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_avfoundation.mm)
list(APPEND VIDEOIO_LIBRARIES "-framework AVFoundation" "-framework QuartzCore")
else()
list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_avfoundation_mac.mm)
list(APPEND VIDEOIO_LIBRARIES "-framework Cocoa" "-framework Accelerate" "-framework AVFoundation" "-framework CoreGraphics" "-framework CoreImage" "-framework CoreMedia" "-framework CoreVideo" "-framework QuartzCore")
endif()
endif()
if(HAVE_QUICKTIME)
modules/videoio/src/cap_avfoundation_mac.mm
+1322
View File
File diff suppressed because it is too large Load Diff