Merge pull request #2390 from nicolasmartin3d:master_bug3546

604a64b2 · Vadim Pisarevsky · OpenCV Buildbot · a0bf7f82 · 67cf0dab · 604a64b2
Commit 604a64b2 authored Apr 10, 2014 by Vadim Pisarevsky Committed by OpenCV Buildbot Apr 10, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

OpenCVFindLibsGUI.cmake cmake/OpenCVFindLibsGUI.cmake +1 -1

OpenCVFindLibsVideo.cmake cmake/OpenCVFindLibsVideo.cmake +1 -1

No files found.
--- a/cmake/OpenCVFindLibsGUI.cmake
+++ b/cmake/OpenCVFindLibsGUI.cmake
@@ -69,7 +69,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()