Skip to content

O
opencv
Commit decd6c0f authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

Restored QuartzCore framework for OS X

parent 0716ebb7
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/highgui/CMakeLists.txt
View file @ decd6c0f
...@@ -182,15 +182,15 @@ endif(WITH_IMAGEIO) ...@@ -182,15 +182,15 @@ endif(WITH_IMAGEIO)
if(WITH_AVFOUNDATION) if(WITH_AVFOUNDATION)
add_definitions(-DHAVE_AVFOUNDATION=1) add_definitions(-DHAVE_AVFOUNDATION=1)
list(APPEND highgui_srcs src/cap_avfoundation.mm) list(APPEND highgui_srcs src/cap_avfoundation.mm)
list(APPEND HIGHGUI_LIBRARIES "-framework AVFoundation") list(APPEND HIGHGUI_LIBRARIES "-framework AVFoundation" "-framework QuartzCore")
elseif(APPLE) elseif(APPLE)
add_definitions(-DHAVE_QUICKTIME=1) add_definitions(-DHAVE_QUICKTIME=1)
if(WITH_QUICKTIME) if(WITH_QUICKTIME)
list(APPEND highgui_srcs src/cap_qt.cpp) list(APPEND highgui_srcs src/cap_qt.cpp)
list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime" "-framework CoreFoundation") list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime" "-framework CoreFoundation" "-framework QuartzCore")
else() else()
list(APPEND highgui_srcs src/cap_qtkit.mm) list(APPEND highgui_srcs src/cap_qtkit.mm)
list(APPEND HIGHGUI_LIBRARIES "-framework QTKit") list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore")
endif() endif()
endif() endif()
......
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