Restored QuartzCore framework for OS X
This commit is contained in:
parent
0716ebb7a6
commit
decd6c0fab
@ -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()
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user