fix CMake changes

88712d97 · Alexander Shishkov · 396f6bb5 · 88712d97 · 88712d97
Commit 88712d97 authored Aug 23, 2013 by Alexander Shishkov
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 12 deletions

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

CMakeLists.txt modules/highgui/CMakeLists.txt +6 -8

No files found.
--- 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()
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -210,14 +210,12 @@ if(HAVE_AVFOUNDATION)
  list(APPEND HIGHGUI_LIBRARIES "-framework AVFoundation" "-framework QuartzCore")
 endif()
-if (NOT IOS)
+if(HAVE_QUICKTIME)
-  if(HAVE_QUICKTIME)
+  list(APPEND highgui_srcs src/cap_qt.cpp)
-    list(APPEND highgui_srcs src/cap_qt.cpp)
+  list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime" "-framework CoreFoundation" "-framework QuartzCore")
-    list(APPEND HIGHGUI_LIBRARIES "-framework Carbon" "-framework QuickTime" "-framework CoreFoundation" "-framework QuartzCore")
+elseif(HAVE_QTKIT)
-  elseif(HAVE_QTKIT)
+  list(APPEND highgui_srcs src/cap_qtkit.mm)
-    list(APPEND highgui_srcs src/cap_qtkit.mm)
+  list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore" "-framework AppKit")
-    list(APPEND HIGHGUI_LIBRARIES "-framework QTKit" "-framework QuartzCore" "-framework AppKit")
-  endif()
 endif()
 if(IOS)