generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix CMake changes

Browse Source
This commit is contained in:
Alexander Shishkov 2013-08-23 16:09:41 +04:00
parent 396f6bb55f
commit 88712d97c6
2 changed files with 12 additions and 12 deletions

10
cmake/OpenCVFindLibsVideo.cmake

@ -241,8 +241,10 @@ if(WITH_AVFOUNDATION)
endif() endif()
# --- QuickTime --- # --- QuickTime ---
if(WITH_QUICKTIME) if (NOT IOS)
set(HAVE_QUICKTIME YES) if(WITH_QUICKTIME)
elseif(APPLE) set(HAVE_QUICKTIME YES)
set(HAVE_QTKIT YES) elseif(APPLE)
set(HAVE_QTKIT YES)
endif()
endif() endif()

14
modules/highgui/CMakeLists.txt

@ -210,14 +210,12 @@ if(HAVE_AVFOUNDATION)
list(APPEND HIGHGUI_LIBRARIES "-framework AVFoundation" "-framework QuartzCore") list(APPEND HIGHGUI_LIBRARIES "-framework AVFoundation" "-framework QuartzCore")
endif() endif()
if (NOT IOS) if(HAVE_QUICKTIME)
if(HAVE_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" "-framework QuartzCore")
list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime" "-framework CoreFoundation" "-framework QuartzCore") elseif(HAVE_QTKIT)
elseif(HAVE_QTKIT) list(APPEND highgui_srcs src/cap_qtkit.mm)
list(APPEND highgui_srcs src/cap_qtkit.mm) list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore" "-framework AppKit")
list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore" "-framework AppKit")
endif()
endif() endif()
if(IOS) if(IOS)