Merge remote-tracking branch 'upstream/master'

Rebase to lates upstream
2014-04-13 10:39:32 +01:00
parent 34984328fd f104d5be8c
commit befdef9685
21 changed files with 1437 additions and 804 deletions
--- a/cmake/OpenCVFindLibsGUI.cmake
+++ b/cmake/OpenCVFindLibsGUI.cmake
@@ -82,7 +82,7 @@ endif(WITH_OPENGL)
 if(APPLE)
  if(WITH_CARBON)
    set(HAVE_CARBON YES)
-  elseif(NOT IOS)
+  elseif(NOT IOS AND CMAKE_COMPILER_IS_CLANGCXX)
    set(HAVE_COCOA YES)
  endif()
 endif()
--- a/cmake/OpenCVFindLibsVideo.cmake
+++ b/cmake/OpenCVFindLibsVideo.cmake
@@ -273,7 +273,7 @@ endif()
 if (NOT IOS)
  if(WITH_QUICKTIME)
    set(HAVE_QUICKTIME YES)
-  elseif(APPLE)
+  elseif(APPLE AND CMAKE_COMPILER_IS_CLANGCXX)
    set(HAVE_QTKIT YES)
  endif()
 endif()