fix CMake changes
authorAlexander Shishkov <alexander.shishkov@itseez.com>
Fri, 23 Aug 2013 12:09:41 +0000 (16:09 +0400)
committerAlexander Shishkov <alexander.shishkov@itseez.com>
Fri, 23 Aug 2013 12:09:41 +0000 (16:09 +0400)
cmake/OpenCVFindLibsVideo.cmake
modules/highgui/CMakeLists.txt

index 9572c72..dcd5e87 100644 (file)
@@ -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()
index d5545a7..b49d93a 100644 (file)
@@ -210,14 +210,12 @@ if(HAVE_AVFOUNDATION)
   list(APPEND HIGHGUI_LIBRARIES "-framework AVFoundation" "-framework QuartzCore")
 endif()
 
-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()
+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()
 
 if(IOS)