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

12 years ago · 7cefb6f50b
parent 3182e68b8a 88712d97c6
commit 7cefb6f50b
2 changed files with 7 additions and 5 deletions
--- a/cmake/OpenCVFindLibsGrfmt.cmake
+++ b/cmake/OpenCVFindLibsGrfmt.cmake
@ -114,7 +114,7 @@ if(WITH_JASPER)
 endif()

 # --- libpng (optional, should be searched after zlib) ---
-if(WITH_PNG AND NOT IOS)
+if(WITH_PNG)
  if(BUILD_PNG)
    ocv_clear_vars(PNG_FOUND)
  else()
--- a/cmake/OpenCVFindLibsVideo.cmake
+++ b/cmake/OpenCVFindLibsVideo.cmake
@ -241,8 +241,10 @@ if(WITH_AVFOUNDATION)
 endif()

 # --- QuickTime ---
-if(WITH_QUICKTIME)
-  set(HAVE_QUICKTIME YES)
-elseif(APPLE)
-  set(HAVE_QTKIT YES)
+if (NOT IOS)
+  if(WITH_QUICKTIME)
+    set(HAVE_QUICKTIME YES)
+  elseif(APPLE)
+    set(HAVE_QTKIT YES)
+  endif()
 endif()