From 396f6bb55fd1264b939581a9540f3d2a29aaa38a Mon Sep 17 00:00:00 2001
From: Alexander Shishkov <alexander.shishkov@itseez.com>
Date: Fri, 23 Aug 2013 13:41:19 +0400
Subject: [PATCH] fixed problems with building iOS version
---
cmake/OpenCVFindLibsGrfmt.cmake | 2 +-
modules/highgui/CMakeLists.txt | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
index 9381350c0..f27a302ab 100644
--- 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()
diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt
index b49d93a96..d5545a7ce 100644
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -210,12 +210,14 @@ if(HAVE_AVFOUNDATION)
list(APPEND HIGHGUI_LIBRARIES "-framework AVFoundation" "-framework QuartzCore")
endif()
-if(HAVE_QUICKTIME)
- list(APPEND highgui_srcs src/cap_qt.cpp)
- list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime" "-framework CoreFoundation" "-framework QuartzCore")
-elseif(HAVE_QTKIT)
- list(APPEND highgui_srcs src/cap_qtkit.mm)
- list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore" "-framework AppKit")
+if (NOT IOS)
+ if(HAVE_QUICKTIME)
+ list(APPEND highgui_srcs src/cap_qt.cpp)
+ list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime" "-framework CoreFoundation" "-framework QuartzCore")
+ elseif(HAVE_QTKIT)
+ list(APPEND highgui_srcs src/cap_qtkit.mm)
+ list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore" "-framework AppKit")
+ endif()
endif()
if(IOS)