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

7cefb6f5 · Roman Donchenko · OpenCV Buildbot · 3182e68b · 88712d97 · 7cefb6f5
Commit 7cefb6f5 authored Aug 23, 2013 by Roman Donchenko Committed by OpenCV Buildbot Aug 23, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

OpenCVFindLibsGrfmt.cmake cmake/OpenCVFindLibsGrfmt.cmake +1 -1

OpenCVFindLibsVideo.cmake cmake/OpenCVFindLibsVideo.cmake +6 -4

No files found.
--- 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)
+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()