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

fixed problems with building iOS version

Browse Source
This commit is contained in:
Alexander Shishkov
2013-08-23 13:41:19 +04:00
parent e1397f6c1f
commit 396f6bb55f
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVFindLibsGrfmt.cmake
View File

@@ -114,7 +114,7 @@ if(WITH_JASPER)
endif() endif()
# --- libpng (optional, should be searched after zlib) --- # --- libpng (optional, should be searched after zlib) ---
if(WITH_PNG AND NOT IOS) if(WITH_PNG)
if(BUILD_PNG) if(BUILD_PNG)
ocv_clear_vars(PNG_FOUND) ocv_clear_vars(PNG_FOUND)
else() else()

14
modules/highgui/CMakeLists.txt
View File

@@ -210,12 +210,14 @@ if(HAVE_AVFOUNDATION)
list(APPEND HIGHGUI_LIBRARIES "-framework AVFoundation" "-framework QuartzCore") list(APPEND HIGHGUI_LIBRARIES "-framework AVFoundation" "-framework QuartzCore")
endif() endif()
if(HAVE_QUICKTIME) if (NOT IOS)
list(APPEND highgui_srcs src/cap_qt.cpp) if(HAVE_QUICKTIME)
list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime" "-framework CoreFoundation" "-framework QuartzCore") list(APPEND highgui_srcs src/cap_qt.cpp)
elseif(HAVE_QTKIT) list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime" "-framework CoreFoundation" "-framework QuartzCore")
list(APPEND highgui_srcs src/cap_qtkit.mm) elseif(HAVE_QTKIT)
list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore" "-framework AppKit") list(APPEND highgui_srcs src/cap_qtkit.mm)
list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore" "-framework AppKit")
endif()
endif() endif()
if(IOS) if(IOS)