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

Merge pull request #1335 from alekcac:ios-build-fix

Browse Source
This commit is contained in:
Roman Donchenko 2013-08-23 16:54:48 +04:00 committed by OpenCV Buildbot
commit 7cefb6f50b
2 changed files with 7 additions and 5 deletions
Show Stats 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()

2
cmake/OpenCVFindLibsVideo.cmake
View File

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